[PATCH] uml: fixups for "reuse i386 cpu-specific tuning"
Paolo 'Blaisorblade' Giarrusso [Mon, 14 Nov 2005 00:07:06 +0000 (16:07 -0800)]
A few fixups - show the new submenu only for x86 subarchitecture (it does not
make sense to show it for x86_64 users) and remove X86_CMPXCHG, which is now a
duplicate of Kconfig.i386, even though Kconfig doesn't complain (we also miss
the dependency on !M386 CPU).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/um/Kconfig
arch/um/Kconfig.i386
arch/um/Makefile-i386

index 018f076..563301f 100644 (file)
@@ -35,12 +35,6 @@ config IRQ_RELEASE_METHOD
        bool
        default y
 
-menu "Host processor type and features"
-
-source "arch/i386/Kconfig.cpu"
-
-endmenu
-
 menu "UML-specific options"
 
 config MODE_TT
index 5d92cac..c71b39a 100644 (file)
@@ -1,3 +1,9 @@
+menu "Host processor type and features"
+
+source "arch/i386/Kconfig.cpu"
+
+endmenu
+
 config UML_X86
        bool
        default y
@@ -42,7 +48,3 @@ config ARCH_HAS_SC_SIGNALS
 config ARCH_REUSE_HOST_VSYSCALL_AREA
        bool
        default y
-
-config X86_CMPXCHG
-       bool
-       default y
index 1f7dcb0..7a0e04e 100644 (file)
@@ -35,4 +35,3 @@ cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)
 
 CFLAGS += $(cflags-y)
 USER_CFLAGS += $(cflags-y)
-