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

Commit 5076f005 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Debug output: Fix a couple of small output issues. 



1) Fix utcache to use the proper return macros in order to maintain
the function nesting level.

2) Enable the function nesting level for all ACPI applications instead
of just acpiexec.

Linux kernel behaviour is not affected by this patch as Linux doesn't
use ACPICA object cache mechanism currently.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d6e0a2dd

drivers/acpi/acpica/utcache.c

+6 −6
Original line number Diff line number Diff line
@@ -248,12 +248,12 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache) 
	ACPI_FUNCTION_NAME(os_acquire_object);



	if (!cache) {

		return (NULL);

		return_PTR(NULL);

	}



	status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);

	if (ACPI_FAILURE(status)) {

		return (NULL);

		return_PTR(NULL);

	}



	ACPI_MEM_TRACKING(cache->requests++);
@@ -276,7 +276,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache) 


		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);

		if (ACPI_FAILURE(status)) {

			return (NULL);

			return_PTR(NULL);

		}



		/* Clear (zero) the previously used Object */
@@ -299,15 +299,15 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache) 


		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);

		if (ACPI_FAILURE(status)) {

			return (NULL);

			return_PTR(NULL);

		}



		object = ACPI_ALLOCATE_ZEROED(cache->object_size);

		if (!object) {

			return (NULL);

			return_PTR(NULL);

		}

	}



	return (object);

	return_PTR(object);

}

#endif				/* ACPI_USE_LOCAL_CACHE */

drivers/acpi/acpica/utdebug.c

+2 −2
Original line number Diff line number Diff line
@@ -194,9 +194,9 @@ acpi_debug_print(u32 requested_debug_level, 
	 */

	acpi_os_printf("%9s-%04ld ", module_name, line_number);



#ifdef ACPI_EXEC_APP

#ifdef ACPI_APPLICATION

	/*

	 * For acpi_exec only, emit the thread ID and nesting level.

	 * For acpi_exec/iASL only, emit the thread ID and nesting level.

	 * Note: nesting level is really only useful during a single-thread

	 * execution. Otherwise, multiple threads will keep resetting the

	 * level.