diff options
author | Cedric Le Goater <clg@fr.ibm.com> | 2007-10-17 02:29:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:57 -0400 |
commit | a08b4be74ca4199838cbb03d90906a0fd70d3b3c (patch) | |
tree | 39d40fc150247e00a714a8c30c2900a375519cb6 /ipc/ipc_sysctl.c | |
parent | c98673fee235c158bef237a7851c742976d66284 (diff) |
ipc namespace: remove config ipc ns fix
Finish the work : kill all #ifdef CONFIG_IPC_NS.
Thanks Robert !
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Eric Biederman <ebiederm@xmision.com>
Cc: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/ipc_sysctl.c')
-rw-r--r-- | ipc/ipc_sysctl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c index a88934a1b769..79e24e878c1e 100644 --- a/ipc/ipc_sysctl.c +++ b/ipc/ipc_sysctl.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/sysctl.h> | 15 | #include <linux/sysctl.h> |
16 | #include <linux/uaccess.h> | 16 | #include <linux/uaccess.h> |
17 | 17 | ||
18 | #ifdef CONFIG_IPC_NS | ||
19 | static void *get_ipc(ctl_table *table) | 18 | static void *get_ipc(ctl_table *table) |
20 | { | 19 | { |
21 | char *which = table->data; | 20 | char *which = table->data; |
@@ -23,9 +22,6 @@ static void *get_ipc(ctl_table *table) | |||
23 | which = (which - (char *)&init_ipc_ns) + (char *)ipc_ns; | 22 | which = (which - (char *)&init_ipc_ns) + (char *)ipc_ns; |
24 | return which; | 23 | return which; |
25 | } | 24 | } |
26 | #else | ||
27 | #define get_ipc(T) ((T)->data) | ||
28 | #endif | ||
29 | 25 | ||
30 | #ifdef CONFIG_PROC_FS | 26 | #ifdef CONFIG_PROC_FS |
31 | static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp, | 27 | static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp, |