diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/init_task.h | 8 | ||||
-rw-r--r-- | include/linux/ipc_namespace.h | 5 | ||||
-rw-r--r-- | include/net/net_namespace.h | 5 |
3 files changed, 0 insertions, 18 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index abec69b63d7e..b1ed1cd8e2a8 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -32,14 +32,6 @@ extern struct fs_struct init_fs; | |||
32 | } | 32 | } |
33 | 33 | ||
34 | extern struct nsproxy init_nsproxy; | 34 | extern struct nsproxy init_nsproxy; |
35 | #define INIT_NSPROXY(nsproxy) { \ | ||
36 | .pid_ns = &init_pid_ns, \ | ||
37 | .count = ATOMIC_INIT(1), \ | ||
38 | .uts_ns = &init_uts_ns, \ | ||
39 | .mnt_ns = NULL, \ | ||
40 | INIT_NET_NS(net_ns) \ | ||
41 | INIT_IPC_NS(ipc_ns) \ | ||
42 | } | ||
43 | 35 | ||
44 | #define INIT_SIGHAND(sighand) { \ | 36 | #define INIT_SIGHAND(sighand) { \ |
45 | .count = ATOMIC_INIT(1), \ | 37 | .count = ATOMIC_INIT(1), \ |
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index 07baa38bce37..51952989ad42 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
@@ -62,11 +62,6 @@ extern struct ipc_namespace init_ipc_ns; | |||
62 | extern atomic_t nr_ipc_ns; | 62 | extern atomic_t nr_ipc_ns; |
63 | 63 | ||
64 | extern spinlock_t mq_lock; | 64 | extern spinlock_t mq_lock; |
65 | #if defined(CONFIG_POSIX_MQUEUE) || defined(CONFIG_SYSVIPC) | ||
66 | #define INIT_IPC_NS(ns) .ns = &init_ipc_ns, | ||
67 | #else | ||
68 | #define INIT_IPC_NS(ns) | ||
69 | #endif | ||
70 | 65 | ||
71 | #ifdef CONFIG_SYSVIPC | 66 | #ifdef CONFIG_SYSVIPC |
72 | extern int register_ipcns_notifier(struct ipc_namespace *); | 67 | extern int register_ipcns_notifier(struct ipc_namespace *); |
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 82b7be4db89a..bd10a7908993 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -100,14 +100,9 @@ struct net { | |||
100 | extern struct net init_net; | 100 | extern struct net init_net; |
101 | 101 | ||
102 | #ifdef CONFIG_NET | 102 | #ifdef CONFIG_NET |
103 | #define INIT_NET_NS(net_ns) .net_ns = &init_net, | ||
104 | |||
105 | extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns); | 103 | extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns); |
106 | 104 | ||
107 | #else /* CONFIG_NET */ | 105 | #else /* CONFIG_NET */ |
108 | |||
109 | #define INIT_NET_NS(net_ns) | ||
110 | |||
111 | static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns) | 106 | static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns) |
112 | { | 107 | { |
113 | /* There is nothing to copy so this is a noop */ | 108 | /* There is nothing to copy so this is a noop */ |