summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-03-30 14:16:10 -0400
committerLen Brown <len.brown@intel.com>2007-03-30 14:16:10 -0400
commit4e381a4f06e3c7b350b55a2636b9d45691780eba (patch)
tree74972388d936e252f195e7945d9e7fb6fe1c0e42
parentce20269d1e97030afa476e12b99d2437e748d225 (diff)
downloadblackbird-op-linux-4e381a4f06e3c7b350b55a2636b9d45691780eba.tar.gz
blackbird-op-linux-4e381a4f06e3c7b350b55a2636b9d45691780eba.zip
Revert "ACPI: parse 2nd MADT by default"
This reverts commit 09fe58356d148ff66901ddf639e725ca1a48a0af. http://bugzilla.kernel.org/show_bug.cgi?id=8283 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 ef2ffded1392..12533a958c51 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: 2
+ default: 0
acpi_sleep= [HW,ACPI] Sleep options
Format: { s3_bios, s3_mode }
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 96792a6cc164..c3419182c9a7 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 = 2;
+static int acpi_apic_instance __initdata;
void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
{
OpenPOWER on IntegriCloud