Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[linux-2.6.git] / arch / x86 / kernel / acpi / boot.c

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 25337f2b7399710b27daa28832c94cc2e9adb83e..289247d974c60fe77ed4b989a2a2634734392ab9 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -555,7 +555,7 @@ EXPORT_SYMBOL(acpi_map_lsapic);
 
 int acpi_unmap_lsapic(int cpu)
 {
 
 int acpi_unmap_lsapic(int cpu)
 {

-       x86_cpu_to_apicid[cpu] = -1;
+       per_cpu(x86_cpu_to_apicid, cpu) = -1;

        cpu_clear(cpu, cpu_present_map);
        num_processors--;
 
        cpu_clear(cpu, cpu_present_map);
        num_processors--;