diff options
author | Dave Young <hidave.darkstar@gmail.com> | 2010-03-10 18:24:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:53:10 -0500 |
commit | c55b7c3e82d0ad58f35a0785faaaf2f70b9b6cd3 (patch) | |
tree | 5672da5b62c6c8e0c806a6b235de5131f7b974c8 | |
parent | 15485a4682d1d3bfee2aa78b4b1a5d36f5746b64 (diff) |
sysctl extern cleanup: acct
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.
Move acct_parm extern declaration to linux/acct.h
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/acct.h | 1 | ||||
-rw-r--r-- | kernel/sysctl.c | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/acct.h b/include/linux/acct.h index 93f46096ad4c..3e4737fa6cce 100644 --- a/include/linux/acct.h +++ b/include/linux/acct.h | |||
@@ -121,6 +121,7 @@ struct vfsmount; | |||
121 | struct super_block; | 121 | struct super_block; |
122 | struct pacct_struct; | 122 | struct pacct_struct; |
123 | struct pid_namespace; | 123 | struct pid_namespace; |
124 | extern int acct_parm[]; /* for sysctl */ | ||
124 | extern void acct_auto_close_mnt(struct vfsmount *m); | 125 | extern void acct_auto_close_mnt(struct vfsmount *m); |
125 | extern void acct_auto_close(struct super_block *sb); | 126 | extern void acct_auto_close(struct super_block *sb); |
126 | extern void acct_collect(long exitcode, int group_dead); | 127 | extern void acct_collect(long exitcode, int group_dead); |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 5290c437f151..7635bb15f5af 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -61,6 +61,9 @@ | |||
61 | #include <asm/stacktrace.h> | 61 | #include <asm/stacktrace.h> |
62 | #include <asm/io.h> | 62 | #include <asm/io.h> |
63 | #endif | 63 | #endif |
64 | #ifdef CONFIG_BSD_PROCESS_ACCT | ||
65 | #include <linux/acct.h> | ||
66 | #endif | ||
64 | #ifdef CONFIG_CHR_DEV_SG | 67 | #ifdef CONFIG_CHR_DEV_SG |
65 | #include <scsi/sg.h> | 68 | #include <scsi/sg.h> |
66 | #endif | 69 | #endif |
@@ -140,10 +143,6 @@ extern int sysctl_userprocess_debug; | |||
140 | extern int spin_retry; | 143 | extern int spin_retry; |
141 | #endif | 144 | #endif |
142 | 145 | ||
143 | #ifdef CONFIG_BSD_PROCESS_ACCT | ||
144 | extern int acct_parm[]; | ||
145 | #endif | ||
146 | |||
147 | #ifdef CONFIG_IA64 | 146 | #ifdef CONFIG_IA64 |
148 | extern int no_unaligned_warning; | 147 | extern int no_unaligned_warning; |
149 | extern int unaligned_dump_stack; | 148 | extern int unaligned_dump_stack; |