--- arch/x86/kernel/apic/probe_64.c

+++ arch/x86/kernel/apic/probe_64.c

@@ -67,17 +67,8 @@ void __init default_setup_apic_routing(v

}

#endif

- if (apic == &apic_flat) {

- switch (boot_cpu_data.x86_vendor) {

- case X86_VENDOR_INTEL:

- if (num_processors > 8)

- apic = &apic_physflat;

- break;

- case X86_VENDOR_AMD:

- if (max_physical_apicid >= 8)

- apic = &apic_physflat;

- }

- }

+ if (apic == &apic_flat && num_possible_cpus() > 8)

+ apic = &apic_physflat;

printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);