Merge branch 'x2apic' into release

1 files changed, 30 insertions, 0 deletions

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index a8852952fac4..991c006a301b 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -62,6 +62,18 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
                 }
                 break;
 
+        case ACPI_MADT_TYPE_LOCAL_X2APIC:
+                {
+                        struct acpi_madt_local_x2apic *p =
+                            (struct acpi_madt_local_x2apic *)header;
+                        printk(KERN_INFO PREFIX
+                               "X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n",
+                               p->local_apic_id, p->uid,
+                               (p->lapic_flags & ACPI_MADT_ENABLED) ?
+                               "enabled" : "disabled");
+                }
+                break;
+
         case ACPI_MADT_TYPE_IO_APIC:
                 {
                         struct acpi_madt_io_apic *p =
@@ -116,6 +128,24 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
                 }
                 break;
 
+        case ACPI_MADT_TYPE_LOCAL_X2APIC_NMI:
+                {
+                        u16 polarity, trigger;
+                        struct acpi_madt_local_x2apic_nmi *p =
+                            (struct acpi_madt_local_x2apic_nmi *)header;
+
+                        polarity = p->inti_flags & ACPI_MADT_POLARITY_MASK;
+                        trigger = (p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2;
+
+                        printk(KERN_INFO PREFIX
+                               "X2APIC_NMI (uid[0x%02x] %s %s lint[0x%x])\n",
+                               p->uid,
+                               mps_inti_flags_polarity[polarity],
+                               mps_inti_flags_trigger[trigger],
+                               p->lint);
+                }
+                break;
+
         case ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE:
                 {
                         struct acpi_madt_local_apic_override *p =