Commit 11dea190 authored Apr 02, 2009 by Serge E. Hallyn Committed by Linus Torvalds Apr 02, 2009

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>

parent e562aebc

ipc/ipc_sysctl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)
		{

kernel/utsname_sysctl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 ????

Admin message