The patch titled
uml: tidy biarch gcc support
has been removed from the -mm tree. Its filename is
uml-tidy-biarch-gcc-support.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: uml: tidy biarch gcc support
From: Jeff Dike <jdike@xxxxxxxxxxx>
On top of the previous biarch changes for UML, this makes the preprocessor
changes a bit cleaner. Specify the 64-bit build in CPPFLAGS on the x86_64
SUBARCH, rather than #undef'ing i386. Compile-tested with i386 and x86_64
SUBARCHs.
Signed-off-by: Nishanth Aravamudan <nacc@xxxxxxxxxx>
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/Makefile-x86_64 | 1 +
arch/um/kernel/vmlinux.lds.S | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff -puN arch/um/kernel/vmlinux.lds.S~uml-tidy-biarch-gcc-support arch/um/kernel/vmlinux.lds.S
--- a/arch/um/kernel/vmlinux.lds.S~uml-tidy-biarch-gcc-support
+++ a/arch/um/kernel/vmlinux.lds.S
@@ -1,5 +1,3 @@
-/* in case the preprocessor is a 32bit one */
-#undef i386
#ifdef CONFIG_LD_SCRIPT_STATIC
#include "uml.lds.S"
#else
diff -puN arch/um/Makefile-x86_64~uml-tidy-biarch-gcc-support arch/um/Makefile-x86_64
--- a/arch/um/Makefile-x86_64~uml-tidy-biarch-gcc-support
+++ a/arch/um/Makefile-x86_64
@@ -11,6 +11,7 @@ USER_CFLAGS += -fno-builtin -m64
CHECKFLAGS += -m64
AFLAGS += -m64
LDFLAGS += -m elf_x86_64
+CPPFLAGS += -m64
ELF_ARCH := i386:x86-64
ELF_FORMAT := elf64-x86-64
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
reduce-max_nr_zones-make-zone_highmem-optional-fix-fix-fix.patch
uml-remove-pte_mkexec.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
