diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:14:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 11:14:58 +0200 |
| commit | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce (patch) | |
| tree | d4c5eba8cd2abefd7c9f16d089393f0f5999cf63 /arch/x86/Kconfig.debug | |
| parent | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (diff) | |
| parent | 9340e1ccdf7b9b22a2be7f51cd74e8b5e11961bf (diff) | |
| download | linux-3.10-3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce.tar.gz linux-3.10-3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce.tar.bz2 linux-3.10-3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce.zip | |
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>
Diffstat (limited to 'arch/x86/Kconfig.debug')
| -rw-r--r-- | arch/x86/Kconfig.debug | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 38a15333f72..f0684bb74fa 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 |