proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers
authorSerge E. Hallyn <serue@us.ibm.com>
Thu, 2 Apr 2009 23:58:27 +0000 (16:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 02:05:01 +0000 (19:05 -0700)
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>
ipc/ipc_sysctl.c
kernel/utsname_sysctl.c

index 4a7a12c95abeff95f5f50838ad8f6bf9da1262b1..40eab7314aeb6c38fcef65ea58cea52421e646ff 100644 (file)
@@ -26,7 +26,7 @@ static void *get_ipc(ctl_table *table)
        return which;
 }
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_PROC_SYSCTL
 static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp,
        void __user *buffer, size_t *lenp, loff_t *ppos)
 {
index 3b34b3545936dfcd179eca7f9fd2aebf4a2abfa0..92359cc747a7c52cb85e362ab3b9178e4756ee2d 100644 (file)
@@ -37,7 +37,7 @@ static void put_uts(ctl_table *table, int write, void *which)
                up_write(&uts_sem);
 }
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_PROC_SYSCTL
 /*
  *     Special case of dostring for the UTS structure. This has locks
  *     to observe. Should this be in kernel/sys.c ????