From 5bc28dd1b4dc921c4317c2cc25f679a5ce947e6b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 10 Feb 2007 01:45:51 -0800
Subject: [PATCH] --- yaml --- r: 47574 b: refs/heads/master c:
 cb799b8988e40a7871ae8e976248c33c562e3555 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/sysctl.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 89262bc2a337..1d80a37cb295 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aab0ad5ed82d6be5173f5d2e9da6be9c1e84a9c
+refs/heads/master: cb799b8988e40a7871ae8e976248c33c562e3555
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index 7733ef58aaca..84cab0ce44d9 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -2767,12 +2767,14 @@ static int sysctl_uts_string(ctl_table *table, int __user *name, int nlen,
 {
 	return -ENOSYS;
 }
+#ifdef CONFIG_SYSVIPC
 static int sysctl_ipc_data(ctl_table *table, int __user *name, int nlen,
 		void __user *oldval, size_t __user *oldlenp,
 		void __user *newval, size_t newlen)
 {
 	return -ENOSYS;
 }
+#endif
 #endif /* CONFIG_SYSCTL_SYSCALL */
 
 /*