The patch titled
arm: fix 'make headers_check'
has been added to the -mm tree. Its filename is
arm-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: arm: fix 'make headers_check'
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
This fixes it. Not tested build but it shouldn't actually make any
Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-arm/elf.h | 15 ++++++++-------
include/asm-arm/page.h | 6 ++----
2 files changed, 10 insertions(+), 11 deletions(-)
diff -puN include/asm-arm/elf.h~arm-make-headers_check include/asm-arm/elf.h
--- a/include/asm-arm/elf.h~arm-make-headers_check
+++ a/include/asm-arm/elf.h
@@ -8,7 +8,6 @@
#include <asm/ptrace.h>
#include <asm/user.h>
-#include <asm/procinfo.h>
typedef unsigned long elf_greg_t;
typedef unsigned long elf_freg_t[3];
@@ -30,11 +29,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGR
typedef struct user_fp elf_fpregset_t;
/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )
-
-/*
* These are used to set parameters in the core dumps.
*/
#define ELF_CLASS ELFCLASS32
@@ -45,6 +39,14 @@ typedef struct user_fp elf_fpregset_t;
#endif
#define ELF_ARCH EM_ARM
+#ifdef __KERNEL__
+#include <asm/procinfo.h>
+/*
+ * This is used to ensure we don't load something for the wrong architecture.
+ */
+#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )
+
+
#define USE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE 4096
@@ -81,7 +83,6 @@ typedef struct user_fp elf_fpregset_t;
extern char elf_platform[];
#define ELF_PLATFORM (elf_platform)
-#ifdef __KERNEL__
/*
* 32-bit code is always OK. Some cpus can do 26-bit, some can't.
diff -puN include/asm-arm/page.h~arm-make-headers_check include/asm-arm/page.h
--- a/include/asm-arm/page.h~arm-make-headers_check
+++ a/include/asm-arm/page.h
@@ -10,14 +10,13 @@
#ifndef _ASMARM_PAGE_H
#define _ASMARM_PAGE_H
+#ifdef __KERNEL__
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
-
/* to align the pointer to the (next) page boundary */
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
@@ -193,8 +192,7 @@ extern pmd_t *top_pmd;
#define ARCH_SLAB_MINALIGN 8
#endif
-#endif /* __KERNEL__ */
-
#include <asm-generic/page.h>
+#endif /* __KERNEL__ */
#endif
_
Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are
headers_check-improve-include-regexp.patch
headers_check-clarify-error-message.patch
headers_check-reduce-user-visible-noise-in-linux-nfs_fsh.patch
headers_check-remove-asm-timexh-from-user-export.patch
headers_check-move-inclusion-of-linux-linkageh-in.patch
headers_check-move-kernel-only-includes-within-asm-i386-elfh.patch
headers_check-dont-expose-pfn-stuff-to-userspace-in.patch
headers_check-fix-userspace-build-of-asm-mips-pageh.patch
fix-make-headers_check-on-biarch-architectures-for.patch
fix-make-headers_check-on-s390-for-2618.patch
fix-make-headers_check-on-ia64-for-2618.patch
fix-make-headers_check-on-x86_64-for-2618.patch
fix-make-headers_check-on-i386-for-2618.patch
arm-make-headers_check.patch
fix-make-headers_check-for-alpha-in-2618.patch
fix-make-headers_check-for-parisc-in-2618.patch
git-gfs2.patch
git-mtd.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
pci-quirks-update.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
linux-magich-for-magic-numbers-headers_install-fix.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
