diff --git a/[refs] b/[refs] index 8b88bf1bbe80..1488e0ae0b51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15485a4682d1d3bfee2aa78b4b1a5d36f5746b64 +refs/heads/master: c55b7c3e82d0ad58f35a0785faaaf2f70b9b6cd3 diff --git a/trunk/include/linux/acct.h b/trunk/include/linux/acct.h index 93f46096ad4c..3e4737fa6cce 100644 --- a/trunk/include/linux/acct.h +++ b/trunk/include/linux/acct.h @@ -121,6 +121,7 @@ struct vfsmount; struct super_block; struct pacct_struct; struct pid_namespace; +extern int acct_parm[]; /* for sysctl */ extern void acct_auto_close_mnt(struct vfsmount *m); extern void acct_auto_close(struct super_block *sb); extern void acct_collect(long exitcode, int group_dead); diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 5290c437f151..7635bb15f5af 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -61,6 +61,9 @@ #include #include #endif +#ifdef CONFIG_BSD_PROCESS_ACCT +#include +#endif #ifdef CONFIG_CHR_DEV_SG #include #endif @@ -140,10 +143,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;