aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/acct.h1
-rw-r--r--kernel/sysctl.c7
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;
121struct super_block; 121struct super_block;
122struct pacct_struct; 122struct pacct_struct;
123struct pid_namespace; 123struct pid_namespace;
124extern int acct_parm[]; /* for sysctl */
124extern void acct_auto_close_mnt(struct vfsmount *m); 125extern void acct_auto_close_mnt(struct vfsmount *m);
125extern void acct_auto_close(struct super_block *sb); 126extern void acct_auto_close(struct super_block *sb);
126extern void acct_collect(long exitcode, int group_dead); 127extern 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;
140extern int spin_retry; 143extern int spin_retry;
141#endif 144#endif
142 145
143#ifdef CONFIG_BSD_PROCESS_ACCT
144extern int acct_parm[];
145#endif
146
147#ifdef CONFIG_IA64 146#ifdef CONFIG_IA64
148extern int no_unaligned_warning; 147extern int no_unaligned_warning;
149extern int unaligned_dump_stack; 148extern int unaligned_dump_stack;