diff --git a/[refs] b/[refs] index 310a8dd21d9b..af09d0455ce7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e5683350f5bcd23d5d579f91d488caeda432617 +refs/heads/master: 45eded8703c0f9d58a8807f80baa9fe98ac0ec67 diff --git a/trunk/drivers/acpi/tables/tbfadt.c b/trunk/drivers/acpi/tables/tbfadt.c index 273b5fddb1ff..a6723a2215c2 100644 --- a/trunk/drivers/acpi/tables/tbfadt.c +++ b/trunk/drivers/acpi/tables/tbfadt.c @@ -333,6 +333,8 @@ static void acpi_tb_convert_fadt(void) pm1_register_length, (acpi_gbl_FADT.xpm1a_event_block.address + pm1_register_length)); + /* Don't forget to copy space_id of the GAS */ + acpi_gbl_xpm1a_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id; /* The PM1B register block is optional, ignore if not present */ @@ -341,6 +343,9 @@ static void acpi_tb_convert_fadt(void) pm1_register_length, (acpi_gbl_FADT.xpm1b_event_block. address + pm1_register_length)); + /* Don't forget to copy space_id of the GAS */ + acpi_gbl_xpm1b_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id; + } }