The patch titled
ipc: headers_check fix
has been added to the -mm tree. Its filename is
ipc-headers_check-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ipc: headers_check fix
From: Cedric Le Goater <clg@xxxxxxxxxx>
Fix headers_check #ifdef __KERNEL__ stuff.
Signed-off-by: Cedric Le Goater <clg@xxxxxxxxxx>
All-the-fault-of: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/Kbuild | 2 +-
include/linux/ipc.h | 3 ++-
include/linux/utsname.h | 17 +++++++++++------
3 files changed, 14 insertions(+), 8 deletions(-)
diff -puN include/linux/Kbuild~ipc-headers_check-fix include/linux/Kbuild
--- a/include/linux/Kbuild~ipc-headers_check-fix
+++ a/include/linux/Kbuild
@@ -158,7 +158,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
@@ -337,6 +336,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 -puN include/linux/ipc.h~ipc-headers_check-fix include/linux/ipc.h
--- a/include/linux/ipc.h~ipc-headers_check-fix
+++ a/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 -puN include/linux/utsname.h~ipc-headers_check-fix include/linux/utsname.h
--- a/include/linux/utsname.h~ipc-headers_check-fix
+++ a/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_u
}
extern struct rw_semaphore uts_sem;
-#endif
+
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_UTSNAME_H */
_
Patches currently in -mm which might be from clg@xxxxxxxxxx are
origin.patch
ipc-headers_check-fix.patch
statistics-replace-inode-ugeneric_ip-with-i_private.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
