The patch titled
headers_check: move kernel-only #includes within <asm-i386/elf.h>
has been removed from the -mm tree. Its filename is
headers_check-move-kernel-only-includes-within-asm-i386-elfh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: headers_check: move kernel-only #includes within <asm-i386/elf.h>
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Some files which don't exist in userspace were being included unconditionally
in asm-i386/elf.h. Move the offending #includes down a few lines so that
they're protected by #ifdef __KERNEL__
In fact, we probably want to kill off all userspace use of asm/elf.h -- but we
aren't there yet, so we should at least make it possible to include it for
now.
Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-i386/elf.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff -puN include/asm-i386/elf.h~headers_check-move-kernel-only-includes-within-asm-i386-elfh include/asm-i386/elf.h
--- a/include/asm-i386/elf.h~headers_check-move-kernel-only-includes-within-asm-i386-elfh
+++ a/include/asm-i386/elf.h
@@ -7,10 +7,7 @@
#include <asm/ptrace.h>
#include <asm/user.h>
-#include <asm/processor.h>
-#include <asm/system.h> /* for savesegment */
#include <asm/auxvec.h>
-#include <asm/desc.h>
#include <linux/utsname.h>
@@ -48,6 +45,12 @@ typedef struct user_fxsr_struct elf_fpxr
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
+#ifdef __KERNEL__
+
+#include <asm/processor.h>
+#include <asm/system.h> /* for savesegment */
+#include <asm/desc.h>
+
/* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program starts %edx
contains a pointer to a function which might be registered using `atexit'.
This provides a mean for the dynamic linker to call DT_FINI functions for
@@ -111,7 +114,6 @@ typedef struct user_fxsr_struct elf_fpxr
#define ELF_PLATFORM (system_utsname.machine)
-#ifdef __KERNEL__
#define SET_PERSONALITY(ex, ibcs2) do { } while (0)
/*
_
Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are
origin.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
fix-make-headers_check-for-alpha-in-2618.patch
headers_check-use-a-different-default-directory.patch
mtd-nand-oob-buffer-offset-fixups.patch
jffs2-summary-fix-a-summary-collecting-bug.patch
arm-make-headers_check.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
fix-make-headers_check-for-parisc-in-2618.patch
pci-quirks-update.patch
avr32-mtd-static-memory-controller-driver-try-2.patch
avr32-mtd-unlock-flash-if-necessary-try-2.patch
avr32-mtd-at49bv6416-platform-device-for-atstk1000.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
pci-mtd-switch-to-pci_get_device-and-do-ref-counting.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
