1 files changed, 8 insertions, 6 deletions

diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index d10e4dc0dae8..0178df306939 100644
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -1,17 +1,14 @@
-core-y += arch/um/sys-i386/ arch/i386/crypto/
+core-y += arch/um/sys-i386/ arch/x86/crypto/
 
 TOP_ADDR := $(CONFIG_TOP_ADDR)
 
-ifeq ($(CONFIG_MODE_SKAS),y)
-  ifneq ($(CONFIG_MODE_TT),y)
-     START := 0x8048000
-  endif
-endif
+START := 0x8048000
 
 LDFLAGS                 += -m elf_i386
 ELF_ARCH                := $(SUBARCH)
 ELF_FORMAT              := elf32-$(SUBARCH)
 OBJCOPYFLAGS            := -O binary -R .note -R .comment -S
+HEADER_ARCH             := x86
 
 ifeq ("$(origin SUBARCH)", "command line")
 ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)")
@@ -24,6 +21,11 @@ export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS
 endif
 endif
 
+CFLAGS                  += -DCONFIG_X86_32
+AFLAGS                  += -DCONFIG_X86_32
+CONFIG_X86_32           := y
+export CONFIG_X86_32
+
 ARCH_KERNEL_DEFINES += -U__$(SUBARCH)__ -U$(SUBARCH)
 
 # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.