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

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

@@ -941,7 +941,7 @@ void disable_local_APIC(void)

unsigned int value;

/* APIC hasn't been mapped yet */

- if (!apic_phys)

+ if (!x2apic_mode && !apic_phys)

return;

clear_local_APIC();

@@ -1664,8 +1664,8 @@ int __init APIC_init_uniprocessor(void)

}

#endif

+#ifndef CONFIG_SMP

enable_IR_x2apic();

-#ifdef CONFIG_X86_64

default_setup_apic_routing();

#endif

@@ -1915,18 +1915,6 @@ void __cpuinit generic_processor_info(in

if (apicid > max_physical_apicid)

max_physical_apicid = apicid;

-#ifdef CONFIG_X86_32

- switch (boot_cpu_data.x86_vendor) {

- case X86_VENDOR_INTEL:

- if (num_processors > 8)

- def_to_bigsmp = 1;

- break;

- case X86_VENDOR_AMD:

- if (max_physical_apicid >= 8)

- def_to_bigsmp = 1;

- }

-#endif

-

#if defined(CONFIG_SMP) || defined(CONFIG_X86_64)

early_per_cpu(x86_cpu_to_apicid, cpu) = apicid;

early_per_cpu(x86_bios_cpu_apicid, cpu) = apicid;