diff options
author | Bob Moore <robert.moore@intel.com> | 2008-01-14 02:23:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-08 12:01:29 -0800 |
commit | 3493ee1fcce90c1f59f811bd0f48963e0395cbe5 (patch) | |
tree | 20a69063fa304deef2e282e0be0a9b3d3a8a2bae | |
parent | a16d391bf3e5c7c42edd5e86d86b4f2baf003a3e (diff) | |
download | linux-stable-3493ee1fcce90c1f59f811bd0f48963e0395cbe5.tar.gz linux-stable-3493ee1fcce90c1f59f811bd0f48963e0395cbe5.tar.bz2 linux-stable-3493ee1fcce90c1f59f811bd0f48963e0395cbe5.zip |
ACPICA: fix acpi_serialize hang regression
patch 014d433f35d7f34b55dcc7b57c7635aaefc3757f in mainline.
http://bugzilla.kernel.org/show_bug.cgi?id=8171
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/acpi/events/evregion.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c index e99f0c435a47..58ad09725dd2 100644 --- a/drivers/acpi/events/evregion.c +++ b/drivers/acpi/events/evregion.c @@ -344,7 +344,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, * setup will potentially execute control methods * (e.g., _REG method for this region) */ - acpi_ex_relinquish_interpreter(); + acpi_ex_exit_interpreter(); status = region_setup(region_obj, ACPI_REGION_ACTIVATE, handler_desc->address_space.context, @@ -352,7 +352,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, /* Re-enter the interpreter */ - acpi_ex_reacquire_interpreter(); + acpi_ex_enter_interpreter(); /* Check for failure of the Region Setup */ @@ -405,7 +405,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, * exit the interpreter because the handler *might* block -- we don't * know what it will do, so we can't hold the lock on the intepreter. */ - acpi_ex_relinquish_interpreter(); + acpi_ex_exit_interpreter(); } /* Call the handler */ @@ -426,7 +426,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, * We just returned from a non-default handler, we must re-enter the * interpreter */ - acpi_ex_reacquire_interpreter(); + acpi_ex_enter_interpreter(); } return_ACPI_STATUS(status); |