From: Jeff Dike 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 Cc: Andi Kleen Signed-off-by: Andrew Morton --- 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 _