diff options
| author |   Cedric Le Goater <clg@fr.ibm.com> | 2006-10-04 02:15:19 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 07:55:12 -0700 |
| commit | b119f13f56a7a47915278ab5eb3c666ca5dbb067 (patch) | |
| tree | 08bc5ae66125dfa5772eea31c26e6ae109843f5b | |
| parent | [PATCH] i383 numa: fix numaq/summit apicid conflict (diff) | |
| download | linux-dev-b119f13f56a7a47915278ab5eb3c666ca5dbb067.tar.xz linux-dev-b119f13f56a7a47915278ab5eb3c666ca5dbb067.zip | |
[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>
| -rw-r--r-- | include/linux/Kbuild | 2 | ||||
| -rw-r--r-- | include/linux/ipc.h | 3 | ||||
| -rw-r--r-- | include/linux/utsname.h | 17 |
3 files changed, 14 insertions, 8 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index f7a52e19b4be..9e8bcb5fa99c 100644 --- a/include/linux/Kbuild +++ b/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/include/linux/ipc.h b/include/linux/ipc.h index d9e2b3f36c35..636094c29b16 100644 --- a/include/linux/ipc.h +++ b/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/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 @@ #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 */ |