2010-02-20 14:19:55

by Dave Young

[permalink] [raw]
Subject: [PATCH 14/18] sysctl extern cleanup - acct

Extern declarations in sysctl.c should be move to their own head file,
and then include them in relavant .c files.

Move acct_parm extern declaration to linux/acct.h

Signed-off-by: Dave Young <[email protected]>
---
include/linux/acct.h | 6 ++++++
kernel/sysctl.c | 5 +----
2 files changed, 7 insertions(+), 4 deletions(-)

--- linux-2.6.32.orig/include/linux/acct.h 2010-02-20 14:33:09.802240564 +0800
+++ linux-2.6.32/include/linux/acct.h 2010-02-20 14:38:16.134711703 +0800
@@ -20,6 +20,12 @@
#include <asm/param.h>
#include <asm/byteorder.h>

+#ifdef __KERNEL__
+#if defined(CONFIG_BSD_PROCESS_ACCT) && defined(CONFIG_SYSCTL)
+extern int acct_parm[];
+#endif
+#endif
+
/*
* comp_t is a 16-bit "floating" point number with a 3-bit base 8
* exponent and a 13-bit fraction.
--- linux-2.6.32.orig/kernel/sysctl.c 2010-02-20 14:33:09.788907860 +0800
+++ linux-2.6.32/kernel/sysctl.c 2010-02-20 14:35:31.031394432 +0800
@@ -62,6 +62,7 @@
#include <linux/latencytop.h>
#include <linux/file.h>
#include <linux/blk-iopoll.h>
+#include <linux/acct.h>
#include <scsi/sg.h>

#include <asm/uaccess.h>
@@ -122,10 +123,6 @@ extern int sysctl_userprocess_debug;
extern int spin_retry;
#endif

-#ifdef CONFIG_BSD_PROCESS_ACCT
-extern int acct_parm[];
-#endif
-
#ifdef CONFIG_IA64
extern int no_unaligned_warning;
extern int unaligned_dump_stack;