The patch titled
m32r: fix 'make headers_check'
has been added to the -mm tree. Its filename is
m32r-fix-make-headers_check.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: m32r: fix 'make headers_check'
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
asm-m32r/page.h requires asm-generic/memory_model.h, which does not exist
asm-m32r/ptrace.h requires asm/m32r.h, which does not exist
asm-m32r/signal.h requires linux/linkage.h, which does not exist
asm-m32r/unistd.h requires asm/syscall.h, which does not exist
asm-m32r/user.h requires asm/processor.h, which does not exist
Signed-off-by: Hirokazu Takata <takata@xxxxxxxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-m32r/page.h | 3 +--
include/asm-m32r/ptrace.h | 4 ++--
include/asm-m32r/signal.h | 1 -
include/asm-m32r/unistd.h | 4 ++--
include/asm-m32r/user.h | 1 -
5 files changed, 5 insertions(+), 8 deletions(-)
diff -puN include/asm-m32r/page.h~m32r-fix-make-headers_check include/asm-m32r/page.h
--- a/include/asm-m32r/page.h~m32r-fix-make-headers_check
+++ a/include/asm-m32r/page.h
@@ -87,10 +87,9 @@ typedef struct { unsigned long pgprot; }
#define devmem_is_allowed(x) 1
-#endif /* __KERNEL__ */
-
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
+#endif /* __KERNEL__ */
#endif /* _ASM_M32R_PAGE_H */
diff -puN include/asm-m32r/ptrace.h~m32r-fix-make-headers_check include/asm-m32r/ptrace.h
--- a/include/asm-m32r/ptrace.h~m32r-fix-make-headers_check
+++ a/include/asm-m32r/ptrace.h
@@ -12,8 +12,6 @@
* Copyright (C) 2001-2002, 2004 Hirokazu Takata <takata at linux-m32r.org>
*/
-#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */
-
/* 0 - 13 are integer registers (general purpose registers). */
#define PT_R4 0
#define PT_R5 1
@@ -140,6 +138,8 @@ struct pt_regs {
#ifdef __KERNEL__
+#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */
+
#define __ARCH_SYS_PTRACE 1
#if defined(CONFIG_ISA_M32R2) || defined(CONFIG_CHIP_VDEC2)
diff -puN include/asm-m32r/signal.h~m32r-fix-make-headers_check include/asm-m32r/signal.h
--- a/include/asm-m32r/signal.h~m32r-fix-make-headers_check
+++ a/include/asm-m32r/signal.h
@@ -6,7 +6,6 @@
/* orig : i386 2.4.18 */
#include <linux/types.h>
-#include <linux/linkage.h>
#include <linux/time.h>
#include <linux/compiler.h>
diff -puN include/asm-m32r/unistd.h~m32r-fix-make-headers_check include/asm-m32r/unistd.h
--- a/include/asm-m32r/unistd.h~m32r-fix-make-headers_check
+++ a/include/asm-m32r/unistd.h
@@ -3,8 +3,6 @@
/* $Id$ */
-#include <asm/syscall.h> /* SYSCALL_* */
-
/*
* This file contains the system call numbers.
*/
@@ -304,6 +302,8 @@
* <asm-m32r/errno.h>
*/
+#include <asm/syscall.h> /* SYSCALL_* */
+
#define __syscall_return(type, res) \
do { \
if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
diff -puN include/asm-m32r/user.h~m32r-fix-make-headers_check include/asm-m32r/user.h
--- a/include/asm-m32r/user.h~m32r-fix-make-headers_check
+++ a/include/asm-m32r/user.h
@@ -8,7 +8,6 @@
*/
#include <linux/types.h>
-#include <asm/processor.h>
#include <asm/ptrace.h>
#include <asm/page.h>
_
Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are
git-gfs2.patch
hdrcheck-permission-fix.patch
mtd-maps-ixp4xx-partition-parsing.patch
fix-the-unlock-addr-lookup-bug-in-mtd-jedec-probe.patch
mtd-printk-format-warning.patch
fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch
drivers-mtd-nand-au1550ndc-removal-of-old-code.patch
git-parisc.patch
pci-quirks-update.patch
avr32-mtd-static-memory-controller-driver-try-2.patch
avr32-mtd-at49bv6416-platform-device-for-atstk1000.patch
avr32-mtd-unlock-flash-if-necessary.patch
m32r-fix-make-headers_check.patch
split-i386-and-x86_64-ptraceh.patch
split-i386-and-x86_64-ptraceh-fix.patch
make-uml-use-ptrace-abih.patch
fs-conversions-from-kmallocmemset-to-kzcalloc.patch
add-config_headers_check-option-to-automatically-run-make-headers_check.patch
add-config_headers_check-option-to-automatically-run-make-headers_check-nobble.patch
pci-mtd-switch-to-pci_get_device-and-do-ref-counting.patch
submit-checklist-mention-headers_check.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
debug-shared-irqs.patch
debug-shared-irqs-kconfig-fix.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
