ACPI-CA upstream fixes against acpica-unix-20071114 - Fix a typo: include/platform/acfreebsd.h - Fix compiler warnings: interpreter/executer/exmutex.c namespace/nsparse.c tables/tbfadt.c utilities/utmutex.c --- include/platform/acfreebsd.h 2007-11-14 16:31:19.000000000 -0500 +++ include/platform/acfreebsd.h 2007-11-15 14:57:46.000000000 -0500 @@ -176,7 +176,7 @@ /* Always use FreeBSD code over our local versions */ #define ACPI_USE_SYSTEM_CLIBRARY -+#if defined(_KERNEL) && (__FreeBSD_version < 700020) +#if defined(_KERNEL) && (__FreeBSD_version < 700020) /* Or strstr (used in debugging mode, also move to libkern) */ static __inline char * strstr (char *s, char *find) --- interpreter/executer/exmutex.c 2007-11-14 16:31:21.000000000 -0500 +++ interpreter/executer/exmutex.c 2007-11-15 14:59:19.000000000 -0500 @@ -488,10 +488,10 @@ AcpiExReleaseMutex ( (ObjDesc != AcpiGbl_GlobalLockMutex)) { ACPI_ERROR ((AE_INFO, - "Thread %X cannot release Mutex [%4.4s] acquired by thread %X", - WalkState->Thread->ThreadId, + "Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX", + (unsigned long) WalkState->Thread->ThreadId, AcpiUtGetNodeName (ObjDesc->Mutex.Node), - ObjDesc->Mutex.OwnerThread->ThreadId)); + (unsigned long) ObjDesc->Mutex.OwnerThread->ThreadId)); return_ACPI_STATUS (AE_AML_NOT_OWNER); } --- namespace/nsparse.c 2007-11-14 16:31:24.000000000 -0500 +++ namespace/nsparse.c 2007-11-15 14:57:46.000000000 -0500 @@ -223,7 +223,7 @@ AcpiNsOneCompleteParse ( /* Parse the AML */ - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "*PARSE* pass %d parse\n", PassNumber)); + ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "*PARSE* pass %u parse\n", (UINT8) PassNumber)); Status = AcpiPsParseAml (WalkState); Cleanup: --- tables/tbfadt.c 2007-11-14 16:31:27.000000000 -0500 +++ tables/tbfadt.c 2007-11-15 15:00:15.000000000 -0500 @@ -323,8 +323,8 @@ AcpiTbCreateLocalFadt ( if (Length > sizeof (ACPI_TABLE_FADT)) { ACPI_WARNING ((AE_INFO, - "FADT (revision %u) is longer than ACPI 2.0 version, truncating length 0x%X to 0x%X", - Table->Revision, Length, sizeof (ACPI_TABLE_FADT))); + "FADT (revision %u) is longer than ACPI 2.0 version, truncating length 0x%X to 0x%lX", + Table->Revision, Length, (unsigned long) sizeof (ACPI_TABLE_FADT))); } /* Clear the entire local FADT */ --- utilities/utmutex.c 2007-11-14 16:31:30.000000000 -0500 +++ utilities/utmutex.c 2007-11-15 15:02:40.000000000 -0500 @@ -339,15 +339,16 @@ AcpiUtAcquireMutex ( if (i == MutexId) { ACPI_ERROR ((AE_INFO, - "Mutex [%s] already acquired by this thread [%X]", - AcpiUtGetMutexName (MutexId), ThisThreadId)); + "Mutex [%s] already acquired by this thread [%lX]", + AcpiUtGetMutexName (MutexId), + (unsigned long) ThisThreadId)); return (AE_ALREADY_ACQUIRED); } ACPI_ERROR ((AE_INFO, - "Invalid acquire order: Thread %X owns [%s], wants [%s]", - ThisThreadId, AcpiUtGetMutexName (i), + "Invalid acquire order: Thread %lX owns [%s], wants [%s]", + (unsigned long) ThisThreadId, AcpiUtGetMutexName (i), AcpiUtGetMutexName (MutexId))); return (AE_ACQUIRE_DEADLOCK); @@ -357,15 +358,15 @@ AcpiUtAcquireMutex ( #endif ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, - "Thread %X attempting to acquire Mutex [%s]\n", - ThisThreadId, AcpiUtGetMutexName (MutexId))); + "Thread %lX attempting to acquire Mutex [%s]\n", + (unsigned long) ThisThreadId, AcpiUtGetMutexName (MutexId))); Status = AcpiOsAcquireMutex (AcpiGbl_MutexInfo[MutexId].Mutex, ACPI_WAIT_FOREVER); if (ACPI_SUCCESS (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Thread %X acquired Mutex [%s]\n", - ThisThreadId, AcpiUtGetMutexName (MutexId))); + ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Thread %lX acquired Mutex [%s]\n", + (unsigned long) ThisThreadId, AcpiUtGetMutexName (MutexId))); AcpiGbl_MutexInfo[MutexId].UseCount++; AcpiGbl_MutexInfo[MutexId].ThreadId = ThisThreadId; @@ -373,7 +374,8 @@ AcpiUtAcquireMutex ( else { ACPI_EXCEPTION ((AE_INFO, Status, - "Thread %X could not acquire Mutex [%X]", ThisThreadId, MutexId)); + "Thread %lX could not acquire Mutex [%X]", + (unsigned long) ThisThreadId, MutexId)); } return (Status); @@ -404,7 +406,7 @@ AcpiUtReleaseMutex ( ThisThreadId = AcpiOsGetThreadId (); ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, - "Thread %X releasing Mutex [%s]\n", ThisThreadId, + "Thread %lX releasing Mutex [%s]\n", (unsigned long) ThisThreadId, AcpiUtGetMutexName (MutexId))); if (MutexId > ACPI_MAX_MUTEX)