diff options
author | Cedric Le Goater <clg@fr.ibm.com> | 2007-07-16 02:40:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:47 -0400 |
commit | 7d69a1f4a72b18876c99c697692b78339d491568 (patch) | |
tree | c09faf07f15240592919ec7e3dd722fe4f1dd370 /include/linux/utsname.h | |
parent | 522ed7767e800cff6c650ec64b0ee0677303119c (diff) |
remove CONFIG_UTS_NS and CONFIG_IPC_NS
CONFIG_UTS_NS and CONFIG_IPC_NS have very little value as they only
deactivate the unshare of the uts and ipc namespaces and do not improve
performance.
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Acked-by: "Serge E. Hallyn" <serue@us.ibm.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Pavel Emelianov <xemul@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/utsname.h')
-rw-r--r-- | include/linux/utsname.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/utsname.h b/include/linux/utsname.h index f8d3b326e93a..51ad167611e4 100644 --- a/include/linux/utsname.h +++ b/include/linux/utsname.h | |||
@@ -48,7 +48,6 @@ static inline void get_uts_ns(struct uts_namespace *ns) | |||
48 | kref_get(&ns->kref); | 48 | kref_get(&ns->kref); |
49 | } | 49 | } |
50 | 50 | ||
51 | #ifdef CONFIG_UTS_NS | ||
52 | extern struct uts_namespace *copy_utsname(int flags, struct uts_namespace *ns); | 51 | extern struct uts_namespace *copy_utsname(int flags, struct uts_namespace *ns); |
53 | extern void free_uts_ns(struct kref *kref); | 52 | extern void free_uts_ns(struct kref *kref); |
54 | 53 | ||
@@ -56,18 +55,6 @@ static inline void put_uts_ns(struct uts_namespace *ns) | |||
56 | { | 55 | { |
57 | kref_put(&ns->kref, free_uts_ns); | 56 | kref_put(&ns->kref, free_uts_ns); |
58 | } | 57 | } |
59 | #else | ||
60 | static inline struct uts_namespace *copy_utsname(int flags, | ||
61 | struct uts_namespace *ns) | ||
62 | { | ||
63 | return ns; | ||
64 | } | ||
65 | |||
66 | static inline void put_uts_ns(struct uts_namespace *ns) | ||
67 | { | ||
68 | } | ||
69 | #endif | ||
70 | |||
71 | static inline struct new_utsname *utsname(void) | 58 | static inline struct new_utsname *utsname(void) |
72 | { | 59 | { |
73 | return ¤t->nsproxy->uts_ns->name; | 60 | return ¤t->nsproxy->uts_ns->name; |