From ef550f2e00c3a2a7fb7d75977877962b6ea3e695 Mon Sep 17 00:00:00 2001
From: "Serge E. Hallyn" <serue@us.ibm.com>
Date: Thu, 2 Apr 2009 16:58:27 -0700
Subject: [PATCH] --- yaml --- r: 139702 b: refs/heads/master c:
 11dea1900931ac73184b2f5163a13d24a4e572ea h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/ipc/ipc_sysctl.c        | 2 +-
 trunk/kernel/utsname_sysctl.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index df46e447dcd3..5a63ff84a395 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e562aebc6ccd4385cbbf24debe88ab4bb500c5b4
+refs/heads/master: 11dea1900931ac73184b2f5163a13d24a4e572ea
diff --git a/trunk/ipc/ipc_sysctl.c b/trunk/ipc/ipc_sysctl.c
index 4a7a12c95abe..40eab7314aeb 100644
--- a/trunk/ipc/ipc_sysctl.c
+++ b/trunk/ipc/ipc_sysctl.c
@@ -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)
 {
diff --git a/trunk/kernel/utsname_sysctl.c b/trunk/kernel/utsname_sysctl.c
index 3b34b3545936..92359cc747a7 100644
--- a/trunk/kernel/utsname_sysctl.c
+++ b/trunk/kernel/utsname_sysctl.c
@@ -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 ????