5 files changed, 4 insertions, 91 deletions

diff --git a/arch/x86/kernel/acpi/Makefile_32 b/arch/x86/kernel/acpi/Makefile_32
index a4852a2e9190..045dd54b33e0 100644
--- a/arch/x86/kernel/acpi/Makefile_32
+++ b/arch/x86/kernel/acpi/Makefile_32
@@ -1,7 +1,4 @@
 obj-$(CONFIG_ACPI)              += boot.o
-ifneq ($(CONFIG_PCI),)
-obj-$(CONFIG_X86_IO_APIC)       += earlyquirk_32.o
-endif
 obj-$(CONFIG_ACPI_SLEEP)        += sleep_32.o wakeup_32.o
 
 ifneq ($(CONFIG_ACPI_PROCESSOR),)
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index afd2afe9102d..f28b2e251b1d 100644
--- 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)
 {
-        x86_cpu_to_apicid[cpu] = -1;
+        per_cpu(x86_cpu_to_apicid, cpu) = -1;
         cpu_clear(cpu, cpu_present_map);
         num_processors--;
 
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c
index 2d39f55d29a8..10b67170b133 100644
--- a/arch/x86/kernel/acpi/cstate.c
+++ b/arch/x86/kernel/acpi/cstate.c
@@ -29,7 +29,7 @@
 void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
                                         unsigned int cpu)
 {
-        struct cpuinfo_x86 *c = cpu_data + cpu;
+        struct cpuinfo_x86 *c = &cpu_data(cpu);
 
         flags->bm_check = 0;
         if (num_online_cpus() == 1)
@@ -72,7 +72,7 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu,
                 struct acpi_processor_cx *cx, struct acpi_power_register *reg)
 {
         struct cstate_entry *percpu_entry;
-        struct cpuinfo_x86 *c = cpu_data + cpu;
+        struct cpuinfo_x86 *c = &cpu_data(cpu);
 
         cpumask_t saved_mask;
         int retval;
diff --git a/arch/x86/kernel/acpi/earlyquirk_32.c b/arch/x86/kernel/acpi/earlyquirk_32.c
deleted file mode 100644
index 23f78efc577d..000000000000
--- a/arch/x86/kernel/acpi/earlyquirk_32.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* 
- * Do early PCI probing for bug detection when the main PCI subsystem is 
- * not up yet.
- */
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/acpi.h>
-
-#include <asm/pci-direct.h>
-#include <asm/acpi.h>
-#include <asm/apic.h>
-
-#ifdef CONFIG_ACPI
-
-static int __init nvidia_hpet_check(struct acpi_table_header *header)
-{
-        return 0;
-}
-#endif
-
-static int __init check_bridge(int vendor, int device)
-{
-#ifdef CONFIG_ACPI
-        static int warned;
-        /* According to Nvidia all timer overrides are bogus unless HPET
-           is enabled. */
-        if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
-                if (!warned && acpi_table_parse(ACPI_SIG_HPET,
-                                                nvidia_hpet_check)) {
-                        warned = 1;
-                        acpi_skip_timer_override = 1;
-                          printk(KERN_INFO "Nvidia board "
-                       "detected. Ignoring ACPI "
-                       "timer override.\n");
-                printk(KERN_INFO "If you got timer trouble "
-                                 "try acpi_use_timer_override\n");
-
-                }
-        }
-#endif
-        if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
-                timer_over_8254 = 0;
-                printk(KERN_INFO "ATI board detected. Disabling timer routing "
-                                "over 8254.\n");
-        }
-        return 0;
-}
-
-void __init check_acpi_pci(void)
-{
-        int num, slot, func;
-
-        /* Assume the machine supports type 1. If not it will 
-           always read ffffffff and should not have any side effect.
-           Actually a few buggy systems can machine check. Allow the user
-           to disable it by command line option at least -AK */
-        if (!early_pci_allowed())
-                return;
-
-        /* Poor man's PCI discovery */
-        for (num = 0; num < 32; num++) {
-                for (slot = 0; slot < 32; slot++) {
-                        for (func = 0; func < 8; func++) {
-                                u32 class;
-                                u32 vendor;
-                                class = read_pci_config(num, slot, func,
-                                                        PCI_CLASS_REVISION);
-                                if (class == 0xffffffff)
-                                        break;
-
-                                if ((class >> 16) != PCI_CLASS_BRIDGE_PCI)
-                                        continue;
-
-                                vendor = read_pci_config(num, slot, func,
-                                                         PCI_VENDOR_ID);
-
-                                if (check_bridge(vendor & 0xffff, vendor >> 16))
-                                        return;
-                        }
-
-                }
-        }
-}
diff --git a/arch/x86/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
index b54fded49834..2ed0a4ce62f0 100644
--- a/arch/x86/kernel/acpi/processor.c
+++ b/arch/x86/kernel/acpi/processor.c
@@ -63,7 +63,7 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c)
 void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
 {
         unsigned int cpu = pr->id;
-        struct cpuinfo_x86 *c = cpu_data + cpu;
+        struct cpuinfo_x86 *c = &cpu_data(cpu);
 
         pr->pdc = NULL;
         if (c->x86_vendor == X86_VENDOR_INTEL)