diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:49:01 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:49:01 +0200 |
| commit | 317e2cac4551879f14eb383fd4e5469f29231a0d (patch) | |
| tree | 3d12ea38a84b455b4e52598abb14fd6e176096c5 /arch | |
| parent | Revert "ACPICA: Clear status of GPEs before enabling them" (diff) | |
| parent | Merge back ACPICA changes for v5.2. (diff) | |
| download | linux-dev-317e2cac4551879f14eb383fd4e5469f29231a0d.tar.xz linux-dev-317e2cac4551879f14eb383fd4e5469f29231a0d.zip | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20190405
ACPICA: Namespace: add check to avoid null pointer dereference
ACPICA: Update version to 20190329
ACPICA: utilities: fix spelling of PCC to platform_comm_channel
ACPICA: Rename nameseg length macro/define for clarity
ACPICA: Rename nameseg compare macro for clarity
ACPICA: Rename nameseg copy macro for clarity
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/boot/compressed/acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c index 0ef4ad55b29b..ad84239e595e 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -276,7 +276,7 @@ static unsigned long get_acpi_srat_table(void) if (acpi_table) { header = (struct acpi_table_header *)acpi_table; - if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_SRAT)) + if (ACPI_COMPARE_NAMESEG(header->signature, ACPI_SIG_SRAT)) return acpi_table; } entry += size; |