uml: use of a public MAC is a warning, not an error

[safe/jmp/linux-2.6] / arch / um / Kconfig.i386

diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index 77558a8..717f5d3 100644 (file)
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -1,6 +1,6 @@
 menu "Host processor type and features"
 
-source "arch/i386/Kconfig.cpu"
+source "arch/x86/Kconfig.cpu"
 
 endmenu
 
@@ -8,6 +8,13 @@ config UML_X86
        bool
        default y
 
+config X86_32
+       bool
+       default y
+
+config RWSEM_XCHGADD_ALGORITHM
+       def_bool y
+
 config 64BIT
        bool
        default n
@@ -36,14 +43,14 @@ choice
 
        So, if you do not know what to do here, say 'Default split'.
 
-       config HOST_VMSPLIT_3G
-               bool "Default split (3G/1G user/kernel host split)"
-       config HOST_VMSPLIT_3G_OPT
-               bool "3G/1G user/kernel host split (for full 1G low memory)"
-       config HOST_VMSPLIT_2G
-               bool "2G/2G user/kernel host split"
-       config HOST_VMSPLIT_1G
-               bool "1G/3G user/kernel host split"
+config HOST_VMSPLIT_3G
+       bool "Default split (3G/1G user/kernel host split)"
+config HOST_VMSPLIT_3G_OPT
+       bool "3G/1G user/kernel host split (for full 1G low memory)"
+config HOST_VMSPLIT_2G
+       bool "2G/2G user/kernel host split"
+config HOST_VMSPLIT_1G
+       bool "1G/3G user/kernel host split"
 endchoice
 
 config TOP_ADDR
@@ -65,20 +72,6 @@ config 3_LEVEL_PGTABLES
        However, this it experimental on 32-bit architectures, so if unsure say
        N (on x86-64 it's automatically enabled, instead, as it's safe there).
 
-config STUB_CODE
-       hex
-       default 0xbfffe000 if !HOST_VMSPLIT_2G
-       default 0x7fffe000 if HOST_VMSPLIT_2G
-
-config STUB_DATA
-       hex
-       default 0xbffff000 if !HOST_VMSPLIT_2G
-       default 0x7ffff000 if HOST_VMSPLIT_2G
-
-config STUB_START
-       hex
-       default STUB_CODE
-
 config ARCH_HAS_SC_SIGNALS
        bool
        default y