From 00df9d0ba55671ac59dcc7a5e006beb438117a7a Mon Sep 17 00:00:00 2001
From: Cedric Le Goater <clg@fr.ibm.com>
Date: Wed, 4 Oct 2006 02:15:19 -0700
Subject: [PATCH] --- yaml --- r: 38337 b: refs/heads/master c:
 b119f13f56a7a47915278ab5eb3c666ca5dbb067 h: refs/heads/master i:   38335:
 0a931bbf2dadc7aa4fb9b20e19030ac320cdf789 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/Kbuild    |  2 +-
 trunk/include/linux/ipc.h     |  3 ++-
 trunk/include/linux/utsname.h | 17 +++++++++++------
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f4bf9e9f3ab8..730e63dfc195 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78b656b8bf933101b42409b4492734b23427bfc3
+refs/heads/master: b119f13f56a7a47915278ab5eb3c666ca5dbb067
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index f7a52e19b4be..9e8bcb5fa99c 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -156,7 +156,6 @@ header-y += toshiba.h
 header-y += ultrasound.h
 header-y += un.h
 header-y += utime.h
-header-y += utsname.h
 header-y += video_decoder.h
 header-y += video_encoder.h
 header-y += videotext.h
@@ -333,6 +332,7 @@ unifdef-y += unistd.h
 unifdef-y += usb_ch9.h
 unifdef-y += usbdevice_fs.h
 unifdef-y += user.h
+unifdef-y += utsname.h
 unifdef-y += videodev2.h
 unifdef-y += videodev.h
 unifdef-y += wait.h
diff --git a/trunk/include/linux/ipc.h b/trunk/include/linux/ipc.h
index d9e2b3f36c35..636094c29b16 100644
--- a/trunk/include/linux/ipc.h
+++ b/trunk/include/linux/ipc.h
@@ -2,7 +2,6 @@
 #define _LINUX_IPC_H
 
 #include <linux/types.h>
-#include <linux/kref.h>
 
 #define IPC_PRIVATE ((__kernel_key_t) 0)  
 
@@ -52,6 +51,8 @@ struct ipc_perm
 
 #ifdef __KERNEL__
 
+#include <linux/kref.h>
+
 #define IPCMNI 32768  /* <= MAX_INT limit for ipc arrays (including sysctl changes) */
 
 /* used by in-kernel data structures */
diff --git a/trunk/include/linux/utsname.h b/trunk/include/linux/utsname.h
index 02e4b6972064..a4555fe3754c 100644
--- a/trunk/include/linux/utsname.h
+++ b/trunk/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 {
@@ -35,6 +30,13 @@ struct new_utsname {
 	char domainname[65];
 };
 
+#ifdef __KERNEL__
+
+#include <linux/sched.h>
+#include <linux/kref.h>
+#include <linux/nsproxy.h>
+#include <asm/atomic.h>
+
 struct uts_namespace {
 	struct kref kref;
 	struct new_utsname name;
@@ -86,4 +88,7 @@ static inline struct new_utsname *init_utsname(void)
 }
 
 extern struct rw_semaphore uts_sem;
-#endif
+
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_UTSNAME_H */