Commit b119f13f authored by Cedric Le Goater's avatar Cedric Le Goater Committed by Linus Torvalds
Browse files

[PATCH] ipc: headers_check fix 



Fix headers_check #ifdef __KERNEL__ stuff.

Signed-off-by: default avatarCedric Le Goater <clg@fr.ibm.com>
All-the-fault-of: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 78b656b8

include/linux/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -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

include/linux/ipc.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */

include/linux/utsname.h

+11 −6
Original line number Diff line number Diff line 
#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 */