X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Flinux%2Futsname.h;h=923db99175f2144a8df2ad0c8e3e2e5aaff6ebcc;hb=7e8b99251be8b6f992baa88e3a6ba3c4ae01660b;hp=a4555fe3754cdb639775d5152307692d186a1151;hpb=5a96c5d0c58ead9a0ece03ffe1c116dea6dafe9c;p=powerpc.git

diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index a4555fe375..923db99175 100644
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -48,35 +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)
-{
-	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;