Merge branch 'linus' into tmp.x86.mpparse.new

[linux-2.6] / arch / x86 / kernel / genapic_64.c

diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index c9eabe36ee364517dd99e2ea1832574bf02c01de..1fa8be5bd217b5c45a649e6745b847567a9553f6 100644 (file)
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -25,14 +25,6 @@
 #include <acpi/acpi_bus.h>
 #endif
 
-/* which logical CPU number maps to which CPU (physical APIC ID) */
-#ifdef CONFIG_SMP
-u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata
-                                       = { [0 ... NR_CPUS-1] = BAD_APICID };
-void *x86_cpu_to_apicid_early_ptr;
-#endif
-DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID;
-EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
 DEFINE_PER_CPU(int, x2apic_extra_bits);
 
 struct genapic __read_mostly *genapic = &apic_flat;
@@ -59,7 +51,7 @@ void __init setup_apic_routing(void)
        else
 #endif
 
-       if (cpus_weight(cpu_possible_map) <= 8)
+       if (max_physical_apicid < 8)
                genapic = &apic_flat;
        else
                genapic = &apic_physflat;
@@ -91,7 +83,7 @@ unsigned int read_apic_id(void)
 {
        unsigned int id;
 
-       WARN_ON(preemptible());
+       WARN_ON(preemptible() && num_online_cpus() > 1);
        id = apic_read(APIC_ID);
        if (uv_system_type >= UV_X2APIC)
                id  |= __get_cpu_var(x2apic_extra_bits);