aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/nsparse.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2015-07-01 14:44:23 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-01 23:17:54 +0200
commitfe536995f2fe26fff111a9a06bf3f71e179c92cf (patch)
tree3a5bc345631e851b0fc068dce8556b75ee41f73d /drivers/acpi/acpica/nsparse.c
parentACPICA: Namespace: Add support to allow overriding objects (diff)
downloadlinux-dev-fe536995f2fe26fff111a9a06bf3f71e179c92cf.tar.xz
linux-dev-fe536995f2fe26fff111a9a06bf3f71e179c92cf.zip
ACPICA: Namespace: Add support of OSDT table
ACPICA commit 27415c82fcecf467446f66d1007a0691cc5f3709 This patch adds OSDT (Override System Definition Table) support. When OSDT is loaded, conflict namespace objects will be overridden by the AML interpreter. Bob Moore, Lv Zheng. Link: https://github.com/acpica/acpica/commit/27415c82 Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/nsparse.c')
-rw-r--r--drivers/acpi/acpica/nsparse.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index c95a119767b5..57a4cfe547e4 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -117,6 +117,13 @@ acpi_ns_one_complete_parse(u32 pass_number,
(u8) pass_number);
}
+ /* Found OSDT table, enable the namespace override feature */
+
+ if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_OSDT) &&
+ pass_number == ACPI_IMODE_LOAD_PASS1) {
+ walk_state->namespace_override = TRUE;
+ }
+
if (ACPI_FAILURE(status)) {
acpi_ds_delete_walk_state(walk_state);
goto cleanup;