diff --git a/drivers/include/acpi/platform/acenv.h b/drivers/include/acpi/platform/acenv.h index 056f245ad0..952ddbc836 100644 --- a/drivers/include/acpi/platform/acenv.h +++ b/drivers/include/acpi/platform/acenv.h @@ -246,7 +246,7 @@ /* Type of mutex supported by host. Default is binary semaphores. */ #ifndef ACPI_MUTEX_TYPE -#define ACPI_MUTEX_TYPE ACPI_BINARY_SEMAPHORE +#define ACPI_MUTEX_TYPE ACPI_OSL_MUTEX #endif /* Global Lock acquire/release */ diff --git a/drivers/include/acpi/platform/aclinux.h b/drivers/include/acpi/platform/aclinux.h index 323e5daece..cefff89cc6 100644 --- a/drivers/include/acpi/platform/aclinux.h +++ b/drivers/include/acpi/platform/aclinux.h @@ -125,7 +125,7 @@ #define ACPI_EXPORT_SYMBOL(symbol) EXPORT_SYMBOL(symbol); #define strtoul simple_strtoul -#define acpi_cache_t struct kmem_cache +//#define acpi_cache_t struct kmem_cache #define acpi_spinlock spinlock_t * #define acpi_cpu_flags unsigned long diff --git a/drivers/include/acpi/platform/aclinuxex.h b/drivers/include/acpi/platform/aclinuxex.h index 509e7ca020..95fc6f2926 100644 --- a/drivers/include/acpi/platform/aclinuxex.h +++ b/drivers/include/acpi/platform/aclinuxex.h @@ -96,9 +96,13 @@ static inline void acpi_os_free(void *memory) kfree(memory); } +void *acpi_os_acquire_object(acpi_cache_t * cache); + +u32 __attribute__ ((dllimport)) GetPid(void)__asm__("GetPid"); + static inline acpi_thread_id acpi_os_get_thread_id(void) { - return (acpi_thread_id) (unsigned long)-1; + return (acpi_thread_id) (unsigned long)GetPid(); } /*