diff options
author | Lv Zheng <lv.zheng@intel.com> | 2012-12-19 00:37:29 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-10 06:36:18 -0500 |
commit | 7b6afb6782053f9679f5b9f05287f8c700d7d68f (patch) | |
tree | d8a6236ecfae7037ac265e97b37fa08d1235452f /drivers/acpi/acpica/nsxfeval.c | |
parent | 9c0d793945a343e13d8b0ab20ac825ad5705bcf1 (diff) |
ACPICA: Fix broken call depth tracing logic.
This patch does not affect the generation of the Linux binary.
This patch decreases 26 lines of 20121018 divergence.diff.
The ACPICA uses a call depth tracing mechanism by wrapping the return
statements with return macros and marking the entrance with
ACPI_FUNCTION_TRACE_ macros. There are other ACPI_FUNCTION_ macros used
to mark the functions not using this tracing mechanism.
This patch fixes broken call depth tracing logic.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/nsxfeval.c')
-rw-r--r-- | drivers/acpi/acpica/nsxfeval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c index a5d8ccce10fd..ef29925d1620 100644 --- a/drivers/acpi/acpica/nsxfeval.c +++ b/drivers/acpi/acpica/nsxfeval.c | |||
@@ -492,7 +492,7 @@ acpi_walk_namespace(acpi_object_type type, | |||
492 | */ | 492 | */ |
493 | status = acpi_ut_acquire_read_lock(&acpi_gbl_namespace_rw_lock); | 493 | status = acpi_ut_acquire_read_lock(&acpi_gbl_namespace_rw_lock); |
494 | if (ACPI_FAILURE(status)) { | 494 | if (ACPI_FAILURE(status)) { |
495 | return status; | 495 | return_ACPI_STATUS(status); |
496 | } | 496 | } |
497 | 497 | ||
498 | /* | 498 | /* |
@@ -550,7 +550,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, | |||
550 | 550 | ||
551 | status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); | 551 | status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); |
552 | if (ACPI_FAILURE(status)) { | 552 | if (ACPI_FAILURE(status)) { |
553 | return_ACPI_STATUS(status); | 553 | return (status); |
554 | } | 554 | } |
555 | 555 | ||
556 | node = acpi_ns_validate_handle(obj_handle); | 556 | node = acpi_ns_validate_handle(obj_handle); |