Messages in this thread Patch in this message | | | From | Alexey Starikovskiy <> | Subject | [PATCH 5/5] x86: allow MPPARSE to be deselected in SMP configs | Date | Mon, 19 May 2008 19:47:22 +0400 |
| |
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> ---
arch/x86/Kconfig.debug | 2 +- arch/x86/kernel/setup.c | 2 +- arch/x86/kernel/setup_32.c | 2 +- arch/x86/kernel/setup_64.c | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 5eb480e..f27de28 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug @@ -128,7 +128,7 @@ config 4KSTACKS config X86_FIND_SMP_CONFIG def_bool y - depends on X86_LOCAL_APIC || X86_VOYAGER + depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS depends on X86_32 config X86_MPPARSE diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 089ddfa..c86bda7 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -12,7 +12,7 @@ #include <asm/mpspec.h> #include <asm/apicdef.h> -#ifdef CONFIG_X86_MPPARSE +#ifdef CONFIG_X86_LOCAL_APIC unsigned int num_processors; unsigned disabled_cpus __cpuinitdata; diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 12a31de..9af0d5f 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -846,7 +846,7 @@ void __init setup_arch(char **cmdline_p) "CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n"); #endif #endif -#ifdef CONFIG_X86_LOCAL_APIC +#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS) if (smp_found_config) get_smp_config(); #endif diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 9234675..8047db9 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -439,7 +439,9 @@ void __init setup_arch(char **cmdline_p) /* * Find and reserve possible boot-time SMP configuration: */ +#ifdef CONFIG_X86_MPPARSE find_smp_config(); +#endif #ifdef CONFIG_BLK_DEV_INITRD if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) { unsigned long ramdisk_image = boot_params.hdr.ramdisk_image; @@ -485,8 +487,10 @@ void __init setup_arch(char **cmdline_p) /* * get boot-time SMP configuration: */ +#ifdef CONFIG_X86_MPPARSE if (smp_found_config) get_smp_config(); +#endif init_apic_mappings(); ioapic_init_mappings();
| |