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 <[EMAIL PROTECTED]> Index: linux-2.6.18-mm/arch/um/sys-i386/Makefile =================================================================== --- linux-2.6.18-mm.orig/arch/um/sys-i386/Makefile 2006-07-27 12:36:56.000000000 -0400 +++ linux-2.6.18-mm/arch/um/sys-i386/Makefile 2006-07-27 12:38:40.000000000 -0400 @@ -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 Index: linux-2.6.18-mm/include/asm-um/alternative-asm.i =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.18-mm/include/asm-um/alternative-asm.i 2006-07-27 12:38:40.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef __UM_ALTERNATIVE_ASM_I +#define __UM_ALTERNATIVE_ASM_I + +#include "asm/arch/alternative-asm.i" + +#endif Index: linux-2.6.18-mm/include/asm-um/frame.i =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.18-mm/include/asm-um/frame.i 2006-07-27 12:38:40.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef __UM_FRAME_I +#define __UM_FRAME_I + +#include "asm/arch/frame.i" + +#endif ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
