Skip to contentSkip to conversation

proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers

PATCH In review Serge E. Hallyn 2 participants 2 messages Feb 24, 2009 – Feb 25, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 ipc/ipc_sysctl.c        |    2 +-
 kernel/utsname_sysctl.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
ipc/ipc_sysctl.c +1 -1
index 4a7a12c..40eab73 100644
@@ -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
index 3b34b35..92359cc 100644
@@ -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 ????
Signature · 1 line
1.5.4.3
#1 lore raw
Quoted 4 lines · Serge E. Hallyn

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.

instead of replying, I should have done the patch my self. thanks serge.

C.