From b39318386ab924c596fd15cabd1d7eb000bb3a33 Mon Sep 17 00:00:00 2001
From: Cedric Le Goater <clg@fr.ibm.com>
Date: Tue, 16 Oct 2007 23:29:40 -0700
Subject: [PATCH] --- yaml --- r: 70668 b: refs/heads/master c:
 a08b4be74ca4199838cbb03d90906a0fd70d3b3c h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/ipc/ipc_sysctl.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 11b926dea3ec..8551040261d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c98673fee235c158bef237a7851c742976d66284
+refs/heads/master: a08b4be74ca4199838cbb03d90906a0fd70d3b3c
diff --git a/trunk/ipc/ipc_sysctl.c b/trunk/ipc/ipc_sysctl.c
index a88934a1b769..79e24e878c1e 100644
--- a/trunk/ipc/ipc_sysctl.c
+++ b/trunk/ipc/ipc_sysctl.c
@@ -15,7 +15,6 @@
 #include <linux/sysctl.h>
 #include <linux/uaccess.h>
 
-#ifdef CONFIG_IPC_NS
 static void *get_ipc(ctl_table *table)
 {
 	char *which = table->data;
@@ -23,9 +22,6 @@ static void *get_ipc(ctl_table *table)
 	which = (which - (char *)&init_ipc_ns) + (char *)ipc_ns;
 	return which;
 }
-#else
-#define get_ipc(T) ((T)->data)
-#endif
 
 #ifdef CONFIG_PROC_FS
 static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp,