summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/dswload2.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 20:44:25 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 20:44:25 +0100
commit2bf3b685a35c80fe368dad9da0e77ba48b460939 (patch)
tree3516a82ec33f96d5e9d3f36abef751aa0b788748 /drivers/acpi/acpica/dswload2.c
parentDocumentation: intel_pstate: Document HWP energy/performance hints (diff)
parentcpufreq: schedutil: Rectify comment in sugov_irq_work() function (diff)
downloadlinux-2bf3b685a35c80fe368dad9da0e77ba48b460939.tar.xz
linux-2bf3b685a35c80fe368dad9da0e77ba48b460939.zip
Merge schedutil governor updates for v4.10.
Diffstat (limited to 'drivers/acpi/acpica/dswload2.c')
-rw-r--r--drivers/acpi/acpica/dswload2.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index 028b22a3154e..e36218206bb0 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -607,11 +607,9 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
}
}
- acpi_ex_exit_interpreter();
status =
acpi_ev_initialize_region
(acpi_ns_get_attached_object(node), FALSE);
- acpi_ex_enter_interpreter();
if (ACPI_FAILURE(status)) {
/*