Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy...

[~andy/linux] / include / linux / utsname.h

diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index e10267d402c5b982d46869d1c4f49345081b7f5c..923db99175f2144a8df2ad0c8e3e2e5aaff6ebcc 100644 (file)
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -48,37 +48,14 @@ static inline void get_uts_ns(struct uts_namespace *ns)
        kref_get(&ns->kref);
 }
 
-#ifdef CONFIG_UTS_NS
-extern int unshare_utsname(unsigned long unshare_flags,
-                               struct uts_namespace **new_uts);
-extern int copy_utsname(int flags, struct task_struct *tsk);
+extern struct uts_namespace *copy_utsname(unsigned long flags,
+                                       struct uts_namespace *ns);
 extern void free_uts_ns(struct kref *kref);
 
 static inline void put_uts_ns(struct uts_namespace *ns)
 {
        kref_put(&ns->kref, free_uts_ns);
 }
-#else
-static inline int unshare_utsname(unsigned long unshare_flags,
-                       struct uts_namespace **new_uts)
-{
-       if (unshare_flags & CLONE_NEWUTS)
-               return -EINVAL;
-
-       return 0;
-}
-
-static inline int copy_utsname(int flags, struct task_struct *tsk)
-{
-       if (flags & CLONE_NEWUTS)
-               return -EINVAL;
-       return 0;
-}
-static inline void put_uts_ns(struct uts_namespace *ns)
-{
-}
-#endif
-
 static inline struct new_utsname *utsname(void)
 {
        return &current->nsproxy->uts_ns->name;