Merge branch 'x86/mpparse' into x86/devel

Conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/io_apic_32.c
	arch/x86/kernel/setup_64.c
	arch/x86/mm/init_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 9 deletions

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 38a15333f725..f0684bb74faf 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -137,15 +137,6 @@ config 4KSTACKS
           on the VM subsystem for higher order allocations. This option
           will also use IRQ stacks to compensate for the reduced stackspace.
 
-config X86_FIND_SMP_CONFIG
-        def_bool y
-        depends on X86_LOCAL_APIC || X86_VOYAGER
-        depends on X86_32
-
-config X86_MPPARSE
-        def_bool y
-        depends on (X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64
-
 config DOUBLEFAULT
         default y
         bool "Enable doublefault exception handler" if EMBEDDED