Input: fix locking in memoryless force-feedback devices

[safe/jmp/linux-2.6] / include / linux / utsname.h

diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index afa54e1..69f3997 100644 (file)
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -1,11 +1,6 @@
 #ifndef _LINUX_UTSNAME_H
 #define _LINUX_UTSNAME_H
 
-#include <linux/sched.h>
-#include <linux/kref.h>
-#include <linux/nsproxy.h>
-#include <asm/atomic.h>
-
 #define __OLD_UTS_LEN 8
 
 struct oldold_utsname {
@@ -27,27 +22,35 @@ struct old_utsname {
 };
 
 struct new_utsname {
-       char sysname[65];
-       char nodename[65];
-       char release[65];
-       char version[65];
-       char machine[65];
-       char domainname[65];
+       char sysname[__NEW_UTS_LEN + 1];
+       char nodename[__NEW_UTS_LEN + 1];
+       char release[__NEW_UTS_LEN + 1];
+       char version[__NEW_UTS_LEN + 1];
+       char machine[__NEW_UTS_LEN + 1];
+       char domainname[__NEW_UTS_LEN + 1];
 };
 
+#ifdef __KERNEL__
+
+#include <linux/sched.h>
+#include <linux/kref.h>
+#include <linux/nsproxy.h>
+#include <linux/err.h>
+
 struct uts_namespace {
        struct kref kref;
        struct new_utsname name;
 };
 extern struct uts_namespace init_uts_ns;
 
+#ifdef CONFIG_UTS_NS
 static inline void get_uts_ns(struct uts_namespace *ns)
 {
        kref_get(&ns->kref);
 }
 
-#ifdef CONFIG_UTS_NS
-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)
@@ -55,13 +58,22 @@ static inline void put_uts_ns(struct uts_namespace *ns)
        kref_put(&ns->kref, free_uts_ns);
 }
 #else
-static inline int copy_utsname(int flags, struct task_struct *tsk)
+static inline void get_uts_ns(struct uts_namespace *ns)
 {
-       return 0;
 }
+
 static inline void put_uts_ns(struct uts_namespace *ns)
 {
 }
+
+static inline struct uts_namespace *copy_utsname(unsigned long flags,
+                                       struct uts_namespace *ns)
+{
+       if (flags & CLONE_NEWUTS)
+               return ERR_PTR(-EINVAL);
+
+       return ns;
+}
 #endif
 
 static inline struct new_utsname *utsname(void)
@@ -74,7 +86,8 @@ static inline struct new_utsname *init_utsname(void)
        return &init_uts_ns.name;
 }
 
-#define system_utsname init_uts_ns.name
-
 extern struct rw_semaphore uts_sem;
-#endif
+
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_UTSNAME_H */