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

Commit 10b6575b authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Fix possible warnings for ACPI_THREAD_ID on 64-bit build 



Warnings can be generated for printf-like statements that output
the ACPI_THREAD_ID on 64-bit builds, since this type can expand
to 64-bits depending on how it is defined. Use the %p format
specifier to allow the output to automatically expand to 64 bits.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 41bdd8e9

drivers/acpi/acpica/exmutex.c

+5 −4
Original line number Diff line number Diff line
@@ -373,11 +373,12 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc, 
	     walk_state->thread->thread_id)

	    && (obj_desc != acpi_gbl_global_lock_mutex)) {

		ACPI_ERROR((AE_INFO,

			    "Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX",

			    (unsigned long)walk_state->thread->thread_id,

			    "Thread %p cannot release Mutex [%4.4s] acquired by thread %p",

			    ACPI_CAST_PTR(void, walk_state->thread->thread_id),

			    acpi_ut_get_node_name(obj_desc->mutex.node),

			    (unsigned long)obj_desc->mutex.owner_thread->

			    thread_id));

			    ACPI_CAST_PTR(void,

					  obj_desc->mutex.owner_thread->

					  thread_id)));

		return_ACPI_STATUS(AE_AML_NOT_OWNER);

	}

drivers/acpi/acpica/utdebug.c

+4 −4
Original line number Diff line number Diff line
@@ -179,9 +179,9 @@ acpi_debug_print(u32 requested_debug_level, 
	if (thread_id != acpi_gbl_prev_thread_id) {

		if (ACPI_LV_THREADS & acpi_dbg_level) {

			acpi_os_printf

			    ("\n**** Context Switch from TID %lX to TID %lX ****\n\n",

			     (unsigned long)acpi_gbl_prev_thread_id,

			     (unsigned long)thread_id);

			    ("\n**** Context Switch from TID %p to TID %p ****\n\n",

			     ACPI_CAST_PTR(void, acpi_gbl_prev_thread_id),

			     ACPI_CAST_PTR(void, thread_id));

		}



		acpi_gbl_prev_thread_id = thread_id;
@@ -194,7 +194,7 @@ acpi_debug_print(u32 requested_debug_level, 
	acpi_os_printf("%8s-%04ld ", module_name, line_number);



	if (ACPI_LV_THREADS & acpi_dbg_level) {

		acpi_os_printf("[%04lX] ", (unsigned long)thread_id);

		acpi_os_printf("[%p] ", ACPI_CAST_PTR(void, thread_id));

	}



	acpi_os_printf("[%02ld] %-22.22s: ",

drivers/acpi/acpica/utmutex.c

+13 −13
Original line number Diff line number Diff line
@@ -230,17 +230,18 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id) 
			if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {

				if (i == mutex_id) {

					ACPI_ERROR((AE_INFO,

						    "Mutex [%s] already acquired by this thread [%X]",

						    "Mutex [%s] already acquired by this thread [%p]",

						    acpi_ut_get_mutex_name

						    (mutex_id),

						    this_thread_id));

						    ACPI_CAST_PTR(void,

								  this_thread_id)));



					return (AE_ALREADY_ACQUIRED);

				}



				ACPI_ERROR((AE_INFO,

					    "Invalid acquire order: Thread %X owns [%s], wants [%s]",

					    this_thread_id,

					    "Invalid acquire order: Thread %p owns [%s], wants [%s]",

					    ACPI_CAST_PTR(void, this_thread_id),

					    acpi_ut_get_mutex_name(i),

					    acpi_ut_get_mutex_name(mutex_id)));
@@ -251,24 +252,24 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id) 
#endif



	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,

			  "Thread %lX attempting to acquire Mutex [%s]\n",

			  (unsigned long)this_thread_id,

			  "Thread %p attempting to acquire Mutex [%s]\n",

			  ACPI_CAST_PTR(void, this_thread_id),

			  acpi_ut_get_mutex_name(mutex_id)));



	status = acpi_os_acquire_mutex(acpi_gbl_mutex_info[mutex_id].mutex,

				       ACPI_WAIT_FOREVER);

	if (ACPI_SUCCESS(status)) {

		ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,

				  "Thread %lX acquired Mutex [%s]\n",

				  (unsigned long)this_thread_id,

				  "Thread %p acquired Mutex [%s]\n",

				  ACPI_CAST_PTR(void, this_thread_id),

				  acpi_ut_get_mutex_name(mutex_id)));



		acpi_gbl_mutex_info[mutex_id].use_count++;

		acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id;

	} else {

		ACPI_EXCEPTION((AE_INFO, status,

				"Thread %lX could not acquire Mutex [%X]",

				(unsigned long)this_thread_id, mutex_id));

				"Thread %p could not acquire Mutex [%X]",

				ACPI_CAST_PTR(void, this_thread_id), mutex_id));

	}



	return (status);
@@ -293,9 +294,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id) 
	ACPI_FUNCTION_NAME(ut_release_mutex);



	this_thread_id = acpi_os_get_thread_id();

	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,

			  "Thread %lX releasing Mutex [%s]\n",

			  (unsigned long)this_thread_id,

	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %p releasing Mutex [%s]\n",

			  ACPI_CAST_PTR(void, this_thread_id),

			  acpi_ut_get_mutex_name(mutex_id)));



	if (mutex_id > ACPI_MAX_MUTEX) {