Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b6afb67 authored Dec 19, 2012 by Lv Zheng Committed by Rafael J. Wysocki Jan 10, 2013

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>

parent 9c0d7939

drivers/acpi/acpica/exfldio.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -329,7 +329,6 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
		static u8
		acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
		{
		ACPI_FUNCTION_NAME(ex_register_overflow);

		if (obj_desc->common_field.bit_length >= ACPI_INTEGER_BIT_SIZE) {
		/*

drivers/acpi/acpica/nsxfeval.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -492,7 +492,7 @@ acpi_walk_namespace(acpi_object_type type,
		*/
		status = acpi_ut_acquire_read_lock(&acpi_gbl_namespace_rw_lock);
		if (ACPI_FAILURE(status)) {
		return status;
		return_ACPI_STATUS(status);
		}

		/*
		@@ -550,7 +550,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,

		status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
		if (ACPI_FAILURE(status)) {
		return_ACPI_STATUS(status);
		return (status);
		}

		node = acpi_ns_validate_handle(obj_handle);