diff options
| -rw-r--r-- | arch/um/Kconfig | 6 | ||||
| -rw-r--r-- | arch/um/Kconfig.i386 | 10 | ||||
| -rw-r--r-- | arch/um/Makefile-i386 | 1 |
3 files changed, 6 insertions, 11 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 018f076101f..563301fe5df 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -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 diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386 index 5d92cacd56c..c71b39a677a 100644 --- a/arch/um/Kconfig.i386 +++ b/arch/um/Kconfig.i386 @@ -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 diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 1f7dcb064ae..7a0e04e34bf 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 @@ -35,4 +35,3 @@ cflags-y += $(call cc-option,-mpreferred-stack-boundary=2) CFLAGS += $(cflags-y) USER_CFLAGS += $(cflags-y) - |