dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

x86: allow MPPARSE to be deselected in SMP configs

Browse source
This commit is contained in:
Alexey Starikovskiy 2008-05-20 00:29:59 +04:00 committed by Thomas Gleixner
parent 8732fc4b23
commit 136ef671df
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/Kconfig.debug
View file

@ -127,7 +127,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

2
arch/x86/kernel/setup_32.c
View file

@ -814,7 +814,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

4
arch/x86/kernel/setup_64.c
View file

@ -456,10 +456,12 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled)
efi_reserve_bootmem();
#ifdef CONFIG_X86_MPPARSE
/*
* Find and reserve possible boot-time SMP configuration:
*/
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;
@ -502,11 +504,13 @@ void __init setup_arch(char **cmdline_p)
init_cpu_to_node();
#ifdef CONFIG_X86_MPPARSE
/*
* get boot-time SMP configuration:
*/
if (smp_found_config)
get_smp_config();
#endif
init_apic_mappings();
ioapic_init_mappings();