diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-04-12 03:59:56 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-04-12 03:59:56 -0400 |
| commit | f456277ee15ff5d150191cb4a2f0181a8804c851 (patch) | |
| tree | f8df5107185f42225fe7545702a9a5542e853449 /drivers/acpi/tables.c | |
| parent | c5781ffbbd4f742a58263458145fe7f0ac01d9e0 (diff) | |
| parent | 6c6a828f86d67c157c7a2b26d46ebca0ed0d9c47 (diff) | |
Merge back ACPICA changes for v5.2.
Diffstat (limited to 'drivers/acpi/tables.c')
| -rw-r--r-- | drivers/acpi/tables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 8fccbe49612a..1ffd7b9eefc5 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c | |||
| @@ -670,8 +670,8 @@ static void __init acpi_table_initrd_scan(void) | |||
| 670 | table_length = table->length; | 670 | table_length = table->length; |
| 671 | 671 | ||
| 672 | /* Skip RSDT/XSDT which should only be used for override */ | 672 | /* Skip RSDT/XSDT which should only be used for override */ |
| 673 | if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_RSDT) || | 673 | if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_RSDT) || |
| 674 | ACPI_COMPARE_NAME(table->signature, ACPI_SIG_XSDT)) { | 674 | ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_XSDT)) { |
| 675 | acpi_os_unmap_memory(table, ACPI_HEADER_SIZE); | 675 | acpi_os_unmap_memory(table, ACPI_HEADER_SIZE); |
| 676 | goto next_table; | 676 | goto next_table; |
| 677 | } | 677 | } |