diff options
author | Cedric Le Goater <clg@fr.ibm.com> | 2007-07-15 23:40:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 09:05:47 -0700 |
commit | 7d69a1f4a72b18876c99c697692b78339d491568 (patch) | |
tree | c09faf07f15240592919ec7e3dd722fe4f1dd370 /include/linux/utsname.h | |
parent | 522ed7767e800cff6c650ec64b0ee0677303119c (diff) | |
download | linux-7d69a1f4a72b18876c99c697692b78339d491568.tar.gz linux-7d69a1f4a72b18876c99c697692b78339d491568.tar.bz2 linux-7d69a1f4a72b18876c99c697692b78339d491568.zip |
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) kref_get(&ns->kref); } -#ifdef CONFIG_UTS_NS extern struct uts_namespace *copy_utsname(int flags, struct uts_namespace *ns); extern void free_uts_ns(struct kref *kref); @@ -56,18 +55,6 @@ static inline void put_uts_ns(struct uts_namespace *ns) { kref_put(&ns->kref, free_uts_ns); } -#else -static inline struct uts_namespace *copy_utsname(int flags, - struct uts_namespace *ns) -{ - return ns; -} - -static inline void put_uts_ns(struct uts_namespace *ns) -{ -} -#endif - static inline struct new_utsname *utsname(void) { return ¤t->nsproxy->uts_ns->name; |