ACPI: parse 2nd MADT by default

http://bugzilla.kernel.org/show_bug.cgi?id=7465

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 22c6b8ccaea51feb9e4fdd38684e3a4dcf15a5f0..f0b7a5e5740ad1eaabe02a78cf4cc1de86d79f7e 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -142,7 +142,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: <int>
                        2: use 2nd APIC table, if available
                        1,0: use 1st APIC table
-                       default: 0
+                       default: 2
 
        acpi_sleep=     [HW,ACPI] Sleep options
                        Format: { s3_bios, s3_mode }

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index c3419182c9a72fd033b765f1d48e4ea14c11256c..96792a6cc164188533d32d316c0282389688623b 100644 (file)
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -42,7 +42,7 @@ static char *mps_inti_flags_trigger[] = { "dfl", "edge", "res", "level" };
 
 static struct acpi_table_desc initial_tables[ACPI_MAX_TABLES] __initdata;
 
-static int acpi_apic_instance __initdata;
+static int acpi_apic_instance __initdata = 2;
 
 void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
 {