[PATCH 1/7] UML - semaphore build fix

[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 <jdike@xxxxxxxxxxx>

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/