git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include/asm-x86/irq_64.h: checkpatch cleanups - formatting only
[sfrench/cifs-2.6.git]
/
ipc
/
ipc_sysctl.c
diff --git
a/ipc/ipc_sysctl.c
b/ipc/ipc_sysctl.c
index a88934a1b76906e71663f163cd175ab5bce8c0dd..7f4235bed51bd92323cc6807ca68171c283633e2 100644
(file)
--- a/
ipc/ipc_sysctl.c
+++ b/
ipc/ipc_sysctl.c
@@
-14,8
+14,8
@@
#include <linux/nsproxy.h>
#include <linux/sysctl.h>
#include <linux/uaccess.h>
#include <linux/nsproxy.h>
#include <linux/sysctl.h>
#include <linux/uaccess.h>
+#include <linux/ipc_namespace.h>
-#ifdef CONFIG_IPC_NS
static void *get_ipc(ctl_table *table)
{
char *which = table->data;
static void *get_ipc(ctl_table *table)
{
char *which = table->data;
@@
-23,9
+23,6
@@
static void *get_ipc(ctl_table *table)
which = (which - (char *)&init_ipc_ns) + (char *)ipc_ns;
return which;
}
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,
#ifdef CONFIG_PROC_FS
static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp,