Commit 11dea1900931ac73184b2f5163a13d24a4e572ea

Authored by Serge E. Hallyn
Committed by Linus Torvalds
1 parent e562aebc6c

proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers

As pointed out by Cedric Le Goater (in response to Alexey's original
comment wrt mqns), ipc_sysctl.c and utsname_sysctl.c are using
CONFIG_PROC_FS, not CONFIG_PROC_SYSCTL, to determine whether to define
the proc_handlers.  Change that.

Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Acked-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -26,7 +26,7 @@
26 26 return which;
27 27 }
28 28  
29   -#ifdef CONFIG_PROC_FS
  29 +#ifdef CONFIG_PROC_SYSCTL
30 30 static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp,
31 31 void __user *buffer, size_t *lenp, loff_t *ppos)
32 32 {
kernel/utsname_sysctl.c
... ... @@ -37,7 +37,7 @@
37 37 up_write(&uts_sem);
38 38 }
39 39  
40   -#ifdef CONFIG_PROC_FS
  40 +#ifdef CONFIG_PROC_SYSCTL
41 41 /*
42 42 * Special case of dostring for the UTS structure. This has locks
43 43 * to observe. Should this be in kernel/sys.c ????