diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-05-13 21:30:15 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-05-13 21:30:15 +0300 |
| commit | 82045dd85566d87128dcc66277cf1177d9930a4a (patch) | |
| tree | 22fea6311a4866293005a1a44f34310e4007a3c9 /drivers/acpi/acpica/nsparse.c | |
| parent | e0478542cfd4d993e38d5f92a3f3ecd238805e96 (diff) | |
| parent | ffa6f55eb6188ee73339cab710fabf30d13110a7 (diff) | |
| download | linux-82045dd85566d87128dcc66277cf1177d9930a4a.tar.xz | |
Merge branch 'linus' into core/urgent, to merge in dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/acpica/nsparse.c')
| -rw-r--r-- | drivers/acpi/acpica/nsparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c index c0b4f7bedfab..f16cf5e4742c 100644 --- a/drivers/acpi/acpica/nsparse.c +++ b/drivers/acpi/acpica/nsparse.c @@ -203,7 +203,7 @@ acpi_ns_one_complete_parse(u32 pass_number, /* Found OSDT table, enable the namespace override feature */ - if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_OSDT) && + if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_OSDT) && pass_number == ACPI_IMODE_LOAD_PASS1) { walk_state->namespace_override = TRUE; } |