Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f0ab514 authored by Jay Lan's avatar Jay Lan Committed by Linus Torvalds
Browse files

[PATCH] csa: convert CONFIG tag for extended accounting routines 



There were a few accounting data/macros that are used in CSA but are #ifdef'ed
inside CONFIG_BSD_PROCESS_ACCT.  This patch is to change those ifdef's from
CONFIG_BSD_PROCESS_ACCT to CONFIG_TASK_XACCT.  A few defines are moved from
kernel/acct.c and include/linux/acct.h to kernel/tsacct.c and
include/linux/tsacct_kern.h.

Signed-off-by: default avatarJay Lan <jlan@sgi.com>
Cc: Shailabh Nagar <nagar@watson.ibm.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Jes Sorensen <jes@sgi.com>
Cc: Chris Sturtivant <csturtiv@sgi.com>
Cc: Tony Ernst <tee@sgi.com>
Cc: Guillaume Thouvenin <guillaume.thouvenin@bull.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9acc1853

fs/compat.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include <linux/nfsd/syscall.h>

#include <linux/personality.h>

#include <linux/rwsem.h>

#include <linux/acct.h>

#include <linux/tsacct_kern.h>

#include <linux/mm.h>



#include <net/sock.h>		/* siocdevprivate_ioctl */

fs/exec.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#include <linux/security.h>

#include <linux/syscalls.h>

#include <linux/rmap.h>

#include <linux/acct.h>

#include <linux/tsacct_kern.h>

#include <linux/cn_proc.h>

#include <linux/audit.h>

include/linux/acct.h

+0 −4
Original line number Diff line number Diff line
@@ -124,16 +124,12 @@ extern void acct_auto_close(struct super_block *sb); 
extern void acct_init_pacct(struct pacct_struct *pacct);

extern void acct_collect(long exitcode, int group_dead);

extern void acct_process(void);

extern void acct_update_integrals(struct task_struct *tsk);

extern void acct_clear_integrals(struct task_struct *tsk);

#else

#define acct_auto_close_mnt(x)	do { } while (0)

#define acct_auto_close(x)	do { } while (0)

#define acct_init_pacct(x)	do { } while (0)

#define acct_collect(x,y)	do { } while (0)

#define acct_process()		do { } while (0)

#define acct_update_integrals(x)		do { } while (0)

#define acct_clear_integrals(task)	do { } while (0)

#endif



/*

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ struct task_struct { 
	wait_queue_t *io_wait;

/* i/o counters(bytes read/written, #syscalls */

	u64 rchar, wchar, syscr, syscw;

#if defined(CONFIG_BSD_PROCESS_ACCT)

#if defined(CONFIG_TASK_XACCT)

	u64 acct_rss_mem1;	/* accumulated rss usage */

	u64 acct_vm_mem1;	/* accumulated virtual memory usage */

	clock_t acct_stimexpd;	/* clock_t-converted stime since last update */

include/linux/tsacct_kern.h

+6 −0
Original line number Diff line number Diff line
@@ -18,9 +18,15 @@ static inline void bacct_add_tsk(struct taskstats *stats, struct task_struct *ts 


#ifdef CONFIG_TASK_XACCT

extern void xacct_add_tsk(struct taskstats *stats, struct task_struct *p);

extern void acct_update_integrals(struct task_struct *tsk);

extern void acct_clear_integrals(struct task_struct *tsk);

#else

static inline void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)

{}

static inline void acct_update_integrals(struct task_struct *tsk)

{}

static inline void acct_clear_integrals(struct task_struct *tsk)

{}

#endif /* CONFIG_TASK_XACCT */



#endif