mirror of https://gitee.com/openkylin/linux.git
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: Revert "ACPI: parse 2nd MADT by default"
This commit is contained in:
commit
a5bd1786fb
|
@ -142,7 +142,7 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
Format: <int>
|
Format: <int>
|
||||||
2: use 2nd APIC table, if available
|
2: use 2nd APIC table, if available
|
||||||
1,0: use 1st APIC table
|
1,0: use 1st APIC table
|
||||||
default: 2
|
default: 0
|
||||||
|
|
||||||
acpi_sleep= [HW,ACPI] Sleep options
|
acpi_sleep= [HW,ACPI] Sleep options
|
||||||
Format: { s3_bios, s3_mode }
|
Format: { s3_bios, s3_mode }
|
||||||
|
|
|
@ -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 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)
|
void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue