x86 microcode: firmware data is const

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

diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index 4cc1c218ae4c0eeeee7d1bde524a219bf1cf4e63..cbaaf69bedb29c92055e2272a12efba7f49f9ee1 100644 (file)
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/ctype.h>
 #include <linux/init.h>
+#include <linux/hardirq.h>
 
 #include <asm/smp.h>
 #include <asm/ipi.h>
@@ -24,14 +25,7 @@
 #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;
 
@@ -42,6 +36,9 @@ static enum uv_system_type uv_system_type;
  */
 void __init setup_apic_routing(void)
 {
+       if (uv_system_type == UV_NON_UNIQUE_APIC)
+               genapic = &apic_x2apic_uv_x;
+       else
 #ifdef CONFIG_ACPI
        /*
         * Quirk: some x86_64 machines can only use physical APIC mode
@@ -54,7 +51,7 @@ void __init setup_apic_routing(void)
        else
 #endif
 
-       if (cpus_weight(cpu_possible_map) <= 8)
+       if (num_possible_cpus() <= 8)
                genapic = &apic_flat;
        else
                genapic = &apic_physflat;
@@ -82,6 +79,17 @@ int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
        return 0;
 }
 
+unsigned int read_apic_id(void)
+{
+       unsigned int id;
+
+       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);
+       return id;
+}
+
 enum uv_system_type get_uv_system_type(void)
 {
        return uv_system_type;