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

Commit 965a3d44 authored by Martin Bligh's avatar Martin Bligh Committed by Len Brown
Browse files

ACPI: avoid gcc warnings in ACPI mutex debug code 



32bit vs 64 bit issues.  sizeof(sizeof) and sizeof(pointer) is variable,
but we're trying to print it as unsigned int or u32.

Casts to unsigned long are used because type acpi_thread_id can be any one of

typedef u64 acpi_native_uint;
typedef u32 acpi_native_uint;
typedef u16 acpi_native_uint;
#define acpi_thread_id struct task_struct *

Signed-off-by: default avatarMartin J. Bligh <mbligh@google.com>
Acked-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c7a3bd17

drivers/acpi/executer/exmutex.c

+3 −3
Original line number Diff line number Diff line
@@ -266,10 +266,10 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc, 
	     walk_state->thread->thread_id)

	    && (obj_desc->mutex.os_mutex != ACPI_GLOBAL_LOCK)) {

		ACPI_ERROR((AE_INFO,

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

			    (u32) walk_state->thread->thread_id,

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

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

			    acpi_ut_get_node_name(obj_desc->mutex.node),

			    (u32) obj_desc->mutex.owner_thread->thread_id));

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

		return_ACPI_STATUS(AE_AML_NOT_OWNER);

	}

drivers/acpi/utilities/utdebug.c

+3 −2
Original line number Diff line number Diff line
@@ -180,8 +180,9 @@ acpi_ut_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 %X to TID %X ****\n\n",

			     (u32) acpi_gbl_prev_thread_id, (u32) thread_id);

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

			     (unsigned long) acpi_gbl_prev_thread_id,

			     (unsigned long) thread_id);

		}



		acpi_gbl_prev_thread_id = thread_id;

drivers/acpi/utilities/utmutex.c

+9 −7
Original line number Diff line number Diff line
@@ -243,23 +243,24 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id) 
#endif



	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,

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

			  (u32) this_thread_id, acpi_ut_get_mutex_name(mutex_id)));

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

			  (unsigned long) 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 %X acquired Mutex [%s]\n",

				  (u32) this_thread_id,

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

				  (unsigned long) 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 %X could not acquire Mutex [%X]",

				(u32) this_thread_id, mutex_id));

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

				(unsigned long) this_thread_id, mutex_id));

	}



	return (status);
@@ -285,7 +286,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id) 


	this_thread_id = acpi_os_get_thread_id();

	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,

			  "Thread %X releasing Mutex [%s]\n", (u32) this_thread_id,

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

			  (unsigned long) this_thread_id,

			  acpi_ut_get_mutex_name(mutex_id)));



	if (mutex_id > ACPI_MAX_MUTEX) {