From: Zachary Amsden <zach@vmware.com>

Attempt to fix the UML build by assuming the default i386 subarchitecture
(mach-default).

I can't fully test this because spinlock breakage is still happening in my
tree, but it gets rid of the mach_xxx.h missing file warnings.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/um/Makefile-i386 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff -puN arch/um/Makefile-i386~i386-virtualization-fix-uml-build arch/um/Makefile-i386
--- devel/arch/um/Makefile-i386~i386-virtualization-fix-uml-build	2005-08-17 18:18:16.000000000 -0700
+++ devel-akpm/arch/um/Makefile-i386	2005-08-17 18:18:16.000000000 -0700
@@ -27,7 +27,9 @@ export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UM
 endif
 endif
 
-CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) $(STUB_CFLAGS)
+CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) $(STUB_CFLAGS) \
+	  -Iinclude/asm-i386/mach-default \
+          $(if $(KBUILD_SRC),-Iinclude2/asm-i386/mach-default -I$(srctree)/include/asm-i386/mach-default)
 
 ifneq ($(CONFIG_GPROF),y)
 ARCH_CFLAGS += -DUM_FASTCALL
_