diff options
author | Jay Lan <jlan@engr.sgi.com> | 2006-10-01 02:28:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:29 -0400 |
commit | 8f0ab5147951267134612570604cf8341901a80c (patch) | |
tree | d394edb3ab69396128e7971136f05fd71d863ece /kernel/acct.c | |
parent | 9acc1853519a0473620d424105f9d49ea5b4e62e (diff) |
[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: Jay 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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/acct.c')
-rw-r--r-- | kernel/acct.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index f4330acead46..0aad5ca36a81 100644 --- a/kernel/acct.c +++ b/kernel/acct.c | |||
@@ -602,33 +602,3 @@ void acct_process(void) | |||
602 | do_acct_process(file); | 602 | do_acct_process(file); |
603 | fput(file); | 603 | fput(file); |
604 | } | 604 | } |
605 | |||
606 | |||
607 | /** | ||
608 | * acct_update_integrals - update mm integral fields in task_struct | ||
609 | * @tsk: task_struct for accounting | ||
610 | */ | ||
611 | void acct_update_integrals(struct task_struct *tsk) | ||
612 | { | ||
613 | if (likely(tsk->mm)) { | ||
614 | long delta = | ||
615 | cputime_to_jiffies(tsk->stime) - tsk->acct_stimexpd; | ||
616 | |||
617 | if (delta == 0) | ||
618 | return; | ||
619 | tsk->acct_stimexpd = tsk->stime; | ||
620 | tsk->acct_rss_mem1 += delta * get_mm_rss(tsk->mm); | ||
621 | tsk->acct_vm_mem1 += delta * tsk->mm->total_vm; | ||
622 | } | ||
623 | } | ||
624 | |||
625 | /** | ||
626 | * acct_clear_integrals - clear the mm integral fields in task_struct | ||
627 | * @tsk: task_struct whose accounting fields are cleared | ||
628 | */ | ||
629 | void acct_clear_integrals(struct task_struct *tsk) | ||
630 | { | ||
631 | tsk->acct_stimexpd = 0; | ||
632 | tsk->acct_rss_mem1 = 0; | ||
633 | tsk->acct_vm_mem1 = 0; | ||
634 | } | ||