Jay Lan wrote:
> 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_CSA_ACCT. A few defines are moved from kernel/acct.c and
> include/linux/acct.h to kernel/csa.c and include/linux/csa_kern.h.
>
>
> Signed-off-by: Jay Lan <[email protected]>
>
>
> ------------------------------------------------------------------------
>
> Index: linux/include/linux/acct.h
> ===================================================================
> --- linux.orig/include/linux/acct.h 2006-07-20 11:38:51.956204769 -0700
> +++ linux/include/linux/acct.h 2006-07-20 11:45:32.469053105 -0700
> @@ -124,16 +124,12 @@ extern void acct_auto_close(struct super
> 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
>
> /*
> Index: linux/include/linux/csa_kern.h
> ===================================================================
> --- linux.orig/include/linux/csa_kern.h 2006-07-20 11:44:05.079993220 -0700
> +++ linux/include/linux/csa_kern.h 2006-07-20 11:47:16.266315471 -0700
> @@ -28,4 +28,12 @@ extern void csa_add_tsk(struct taskstats
> */
> #define REV_CSA 07000 /* Kernel: CSA base record */
>
> +#ifdef CONFIG_CSA_ACCT
> +extern void acct_update_integrals(struct task_struct *tsk);
> +extern void acct_clear_integrals(struct task_struct *tsk);
> +#else
> +#define acct_update_integrals(x) do { } while (0)
> +#define acct_clear_integrals(task) do { } while (0)
> +#endif
> +
static inlines preferred
> #endif /* _CSA_KERN_H */
> Index: linux/kernel/acct.c
> ===================================================================
> --- linux.orig/kernel/acct.c 2006-07-20 11:38:51.956204769 -0700
> +++ linux/kernel/acct.c 2006-07-20 11:45:32.477053203 -0700
> @@ -598,33 +598,3 @@ void acct_process(void)
> do_acct_process(file);
> fput(file);
<snip>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
