The patch titled
uml: semaphore build fix
has been added to the -mm tree. Its filename is
fix-x86_64-mm-i386-semaphore-to-asm-uml-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: uml: semaphore build fix
From: Jeff Dike <jdike@xxxxxxxxxxx>
2.6.18-rc2-mm1 broke the UML build on i386. The culprit was i386 moving
kernel/semaphore.c to lib/semaphore.S. I needed to change that path, plus
pull a couple of i386 headers to asm-um.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/sys-i386/Makefile | 2 +-
include/asm-um/alternative-asm.i | 6 ++++++
include/asm-um/frame.i | 6 ++++++
3 files changed, 13 insertions(+), 1 deletion(-)
diff -puN arch/um/sys-i386/Makefile~fix-x86_64-mm-i386-semaphore-to-asm-uml-fix arch/um/sys-i386/Makefile
--- a/arch/um/sys-i386/Makefile~fix-x86_64-mm-i386-semaphore-to-asm-uml-fix
+++ a/arch/um/sys-i386/Makefile
@@ -4,7 +4,7 @@ obj-y = bugs.o checksum.o delay.o fault.
obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
-subarch-obj-y = lib/bitops.o kernel/semaphore.o
+subarch-obj-y = lib/bitops.o lib/semaphore.o
subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem.o
subarch-obj-$(CONFIG_MODULES) += kernel/module.o
diff -puN /dev/null include/asm-um/alternative-asm.i
--- /dev/null
+++ a/include/asm-um/alternative-asm.i
@@ -0,0 +1,6 @@
+#ifndef __UM_ALTERNATIVE_ASM_I
+#define __UM_ALTERNATIVE_ASM_I
+
+#include "asm/arch/alternative-asm.i"
+
+#endif
diff -puN /dev/null include/asm-um/frame.i
--- /dev/null
+++ a/include/asm-um/frame.i
@@ -0,0 +1,6 @@
+#ifndef __UM_FRAME_I
+#define __UM_FRAME_I
+
+#include "asm/arch/frame.i"
+
+#endif
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
reduce-max_nr_zones-make-zone_highmem-optional-fix-fix-fix.patch
fix-x86_64-mm-i386-semaphore-to-asm-uml-fix.patch
uml-use-klibc-setjmp-longjmp.patch
uml-use-array_size-more-assiduously.patch
uml-fix-stack-alignment.patch
uml-whitespace-fixes.patch
uml-fix-handling-of-failed-execs-of-helpers.patch
uml-improve-sigbus-diagnostics.patch
uml-remove-pte_mkexec.patch
vdso-hash-style-fix.patch
vdso-hash-style-fix-fix.patch
namespaces-utsname-switch-to-using-uts-namespaces-uml-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
