diff options
author | Cedric Le Goater <clg@fr.ibm.com> | 2006-10-04 05:15:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:12 -0400 |
commit | b119f13f56a7a47915278ab5eb3c666ca5dbb067 (patch) | |
tree | 08bc5ae66125dfa5772eea31c26e6ae109843f5b /include/linux/utsname.h | |
parent | 78b656b8bf933101b42409b4492734b23427bfc3 (diff) |
[PATCH] ipc: headers_check fix
Fix headers_check #ifdef __KERNEL__ stuff.
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
All-the-fault-of: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/utsname.h')
-rw-r--r-- | include/linux/utsname.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/linux/utsname.h b/include/linux/utsname.h index 02e4b6972064..a4555fe3754c 100644 --- a/include/linux/utsname.h +++ b/include/linux/utsname.h | |||
@@ -1,11 +1,6 @@ | |||
1 | #ifndef _LINUX_UTSNAME_H | 1 | #ifndef _LINUX_UTSNAME_H |
2 | #define _LINUX_UTSNAME_H | 2 | #define _LINUX_UTSNAME_H |
3 | 3 | ||
4 | #include <linux/sched.h> | ||
5 | #include <linux/kref.h> | ||
6 | #include <linux/nsproxy.h> | ||
7 | #include <asm/atomic.h> | ||
8 | |||
9 | #define __OLD_UTS_LEN 8 | 4 | #define __OLD_UTS_LEN 8 |
10 | 5 | ||
11 | struct oldold_utsname { | 6 | struct oldold_utsname { |
@@ -35,6 +30,13 @@ struct new_utsname { | |||
35 | char domainname[65]; | 30 | char domainname[65]; |
36 | }; | 31 | }; |
37 | 32 | ||
33 | #ifdef __KERNEL__ | ||
34 | |||
35 | #include <linux/sched.h> | ||
36 | #include <linux/kref.h> | ||
37 | #include <linux/nsproxy.h> | ||
38 | #include <asm/atomic.h> | ||
39 | |||
38 | struct uts_namespace { | 40 | struct uts_namespace { |
39 | struct kref kref; | 41 | struct kref kref; |
40 | struct new_utsname name; | 42 | struct new_utsname name; |
@@ -86,4 +88,7 @@ static inline struct new_utsname *init_utsname(void) | |||
86 | } | 88 | } |
87 | 89 | ||
88 | extern struct rw_semaphore uts_sem; | 90 | extern struct rw_semaphore uts_sem; |
89 | #endif | 91 | |
92 | #endif /* __KERNEL__ */ | ||
93 | |||
94 | #endif /* _LINUX_UTSNAME_H */ | ||