diff options
Diffstat (limited to 'include/linux/ipc.h')
-rw-r--r-- | include/linux/ipc.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/ipc.h b/include/linux/ipc.h index 7c8c6d8d090c..3fd3ddd5f0d9 100644 --- a/include/linux/ipc.h +++ b/include/linux/ipc.h | |||
@@ -93,6 +93,7 @@ extern struct ipc_namespace init_ipc_ns; | |||
93 | 93 | ||
94 | #ifdef CONFIG_SYSVIPC | 94 | #ifdef CONFIG_SYSVIPC |
95 | #define INIT_IPC_NS(ns) .ns = &init_ipc_ns, | 95 | #define INIT_IPC_NS(ns) .ns = &init_ipc_ns, |
96 | extern void free_ipc_ns(struct kref *kref); | ||
96 | extern struct ipc_namespace *copy_ipcs(unsigned long flags, | 97 | extern struct ipc_namespace *copy_ipcs(unsigned long flags, |
97 | struct ipc_namespace *ns); | 98 | struct ipc_namespace *ns); |
98 | #else | 99 | #else |
@@ -104,13 +105,9 @@ static inline struct ipc_namespace *copy_ipcs(unsigned long flags, | |||
104 | } | 105 | } |
105 | #endif | 106 | #endif |
106 | 107 | ||
107 | #ifdef CONFIG_IPC_NS | ||
108 | extern void free_ipc_ns(struct kref *kref); | ||
109 | #endif | ||
110 | |||
111 | static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) | 108 | static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) |
112 | { | 109 | { |
113 | #ifdef CONFIG_IPC_NS | 110 | #ifdef CONFIG_SYSVIPC |
114 | if (ns) | 111 | if (ns) |
115 | kref_get(&ns->kref); | 112 | kref_get(&ns->kref); |
116 | #endif | 113 | #endif |
@@ -119,7 +116,7 @@ static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) | |||
119 | 116 | ||
120 | static inline void put_ipc_ns(struct ipc_namespace *ns) | 117 | static inline void put_ipc_ns(struct ipc_namespace *ns) |
121 | { | 118 | { |
122 | #ifdef CONFIG_IPC_NS | 119 | #ifdef CONFIG_SYSVIPC |
123 | kref_put(&ns->kref, free_ipc_ns); | 120 | kref_put(&ns->kref, free_ipc_ns); |
124 | #endif | 121 | #endif |
125 | } | 122 | } |
@@ -127,5 +124,3 @@ static inline void put_ipc_ns(struct ipc_namespace *ns) | |||
127 | #endif /* __KERNEL__ */ | 124 | #endif /* __KERNEL__ */ |
128 | 125 | ||
129 | #endif /* _LINUX_IPC_H */ | 126 | #endif /* _LINUX_IPC_H */ |
130 | |||
131 | |||