vserver 1.9.5.x5

[linux-2.6.git] / arch / um / Makefile-i386

diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index 9a6cf6e..97b223b 100644 (file)
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -1,8 +1,6 @@
-ifeq ($(CONFIG_HOST_2G_2G), y)
-TOP_ADDR := 0x80000000
-else
-TOP_ADDR := 0xc0000000
-endif
+SUBARCH_CORE := arch/um/sys-i386/
+
+TOP_ADDR := $(CONFIG_TOP_ADDR)
 
 ifeq ($(CONFIG_MODE_SKAS),y)
   ifneq ($(CONFIG_MODE_TT),y)
@@ -11,6 +9,7 @@ ifeq ($(CONFIG_MODE_SKAS),y)
 endif
 
 CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)
+ARCH_USER_CFLAGS :=
 
 ifneq ($(CONFIG_GPROF),y)
 ARCH_CFLAGS += -DUM_FASTCALL