If we are using hotplug enabled kernel, then make bigsmp the default mode. Signed-off-by: Ashok Raj Signed-off-by: Venkatesh Pallipadi ------------------------------------------------------- arch/i386/kernel/mpparse.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) Index: linux-2.6.15-rc1-mm2/arch/i386/kernel/mpparse.c =================================================================== --- linux-2.6.15-rc1-mm2.orig/arch/i386/kernel/mpparse.c +++ linux-2.6.15-rc1-mm2/arch/i386/kernel/mpparse.c @@ -38,6 +38,12 @@ int smp_found_config; unsigned int __initdata maxcpus = NR_CPUS; +#ifdef CONFIG_HOTPLUG_CPU +#define CPU_HOTPLUG_ENABLED (1) +#else +#define CPU_HOTPLUG_ENABLED (0) +#endif + /* * Various Linux-internal data structures created from the * MP-table. @@ -219,9 +225,10 @@ static void __devinit MP_processor_info cpu_set(num_processors, cpu_possible_map); num_processors++; - if ((num_processors > 8) && - APIC_XAPIC(ver) && - (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)) + if (APIC_XAPIC(ver) && + (CPU_HOTPLUG_ENABLED || + ((num_processors > 8) && + (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)))) def_to_bigsmp = 1; else def_to_bigsmp = 0; --