Merge branches 'acpi-video', 'acpi-battery', 'acpi-processor' and 'acpi-lpss'

[sfrench/cifs-2.6.git] / drivers / acpi / processor_core.c

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 00f48d13a51630df09afced52ac4c77abdec5240..e32321ce9a5cfbc4a80e7101b2784506ff057fc6 100644 (file)
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -129,6 +129,8 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
                map_lapic_id(header, acpi_id, &apic_id);
        } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
                map_lsapic_id(header, type, acpi_id, &apic_id);
+       } else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {
+               map_x2apic_id(header, type, acpi_id, &apic_id);
        }
 
 exit: