summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-03-11 03:32:00 -0400
committerLen Brown <len.brown@intel.com>2007-03-15 04:22:18 -0400
commit09fe58356d148ff66901ddf639e725ca1a48a0af (patch)
tree3427f993b5ff1eca4a38263c880aeb9494cc7ce5
parenta1fdcc0d2714b6622e3fd5c00db1635213d6c41a (diff)
downloadlinux-09fe58356d148ff66901ddf639e725ca1a48a0af.tar.bz2
ACPI: parse 2nd MADT by default
http://bugzilla.kernel.org/show_bug.cgi?id=7465 Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--Documentation/kernel-parameters.txt2
-rw-r--r--drivers/acpi/tables.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 22c6b8ccaea5..f0b7a5e5740a 100644
--- 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 c3419182c9a7..96792a6cc164 100644
--- 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)
{