include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / acpi / processor_core.c

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 9eeda9e..5128435 100644 (file)
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -8,6 +8,7 @@
  *     - Added _PDC for platforms with Intel CPUs
  */
 #include <linux/dmi.h>
+#include <linux/slab.h>
 
 #include <acpi/acpi_drivers.h>
 #include <acpi/processor.h>
@@ -43,8 +44,6 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
 };
 
 #ifdef CONFIG_SMP
-static struct acpi_table_madt *madt;
-
 static int map_lapic_id(struct acpi_subtable_header *entry,
                 u32 acpi_id, int *apic_id)
 {
@@ -66,22 +65,16 @@ static int map_x2apic_id(struct acpi_subtable_header *entry,
 {
        struct acpi_madt_local_x2apic *apic =
                (struct acpi_madt_local_x2apic *)entry;
-       u32 tmp = apic->local_apic_id;
 
-       /* Only check enabled APICs*/
        if (!(apic->lapic_flags & ACPI_MADT_ENABLED))
                return 0;
 
-       /* Device statement declaration type */
-       if (device_declaration) {
-               if (apic->uid == acpi_id)
-                       goto found;
+       if (device_declaration && (apic->uid == acpi_id)) {
+               *apic_id = apic->local_apic_id;
+               return 1;
        }
 
        return 0;
-found:
-       *apic_id = tmp;
-       return 1;
 }
 
 static int map_lsapic_id(struct acpi_subtable_header *entry,
@@ -89,35 +82,34 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
 {
        struct acpi_madt_local_sapic *lsapic =
                (struct acpi_madt_local_sapic *)entry;
-       u32 tmp = (lsapic->id << 8) | lsapic->eid;
 
-       /* Only check enabled APICs*/
        if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))
                return 0;
 
-       /* Device statement declaration type */
        if (device_declaration) {
-               if (entry->length < 16)
-                       printk(KERN_ERR PREFIX
-                           "Invalid LSAPIC with Device type processor (SAPIC ID %#x)\n",
-                           tmp);
-               else if (lsapic->uid == acpi_id)
-                       goto found;
-       /* Processor statement declaration type */
-       } else if (lsapic->processor_id == acpi_id)
-               goto found;
+               if ((entry->length < 16) || (lsapic->uid != acpi_id))
+                       return 0;
+       } else if (lsapic->processor_id != acpi_id)
+               return 0;
 
-       return 0;
-found:
-       *apic_id = tmp;
+       *apic_id = (lsapic->id << 8) | lsapic->eid;
        return 1;
 }
 
 static int map_madt_entry(int type, u32 acpi_id)
 {
        unsigned long madt_end, entry;
+       static struct acpi_table_madt *madt;
+       static int read_madt;
        int apic_id = -1;
 
+       if (!read_madt) {
+               if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
+                                       (struct acpi_table_header **)&madt)))
+                       madt = NULL;
+               read_madt++;
+       }
+
        if (!madt)
                return apic_id;
 
@@ -351,13 +343,6 @@ early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
 
 void __init acpi_early_processor_set_pdc(void)
 {
-
-#ifdef CONFIG_SMP
-       if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_MADT, 0,
-                               (struct acpi_table_header **)&madt)))
-               madt = NULL;
-#endif
-
        /*
         * Check whether the system is DMI table. If yes, OSPM
         * should not use mwait for CPU-states.