diff options
| author | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:36 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:36 -0400 |
| commit | 20b499aa06edf59fa2d21f29d42d36586c6c058e (patch) | |
| tree | 2691a1de8f285fcc9a65fa65bd2ece4d4ec8404f /include | |
| parent | dece75b3a288fa49b3aab685543ec2f5c94b8cfc (diff) | |
| parent | ab8aa06a5c0b75974fb1949365cbb20a15cedf14 (diff) | |
| download | blackbird-op-linux-20b499aa06edf59fa2d21f29d42d36586c6c058e.tar.gz blackbird-op-linux-20b499aa06edf59fa2d21f29d42d36586c6c058e.zip | |
Pull bugzilla-6687 into test branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/aclocal.h | 2 | ||||
| -rw-r--r-- | include/acpi/platform/aclinux.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h index 56b802486161..fbafee6e56d3 100644 --- a/include/acpi/aclocal.h +++ b/include/acpi/aclocal.h @@ -127,7 +127,7 @@ typedef u8 acpi_owner_id; /* This Thread ID means that the mutex is not in use (unlocked) */ -#define ACPI_MUTEX_NOT_ACQUIRED (u32) -1 +#define ACPI_MUTEX_NOT_ACQUIRED (acpi_thread_id) 0 /* Table for the global mutexes */ diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 3f853cabbd41..1cb51bf96ece 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -59,6 +59,7 @@ #include <asm/acpi.h> #include <linux/slab.h> #include <linux/spinlock_types.h> +#include <asm/current.h> /* Host-dependent types and defines */ @@ -100,8 +101,8 @@ #define acpi_cpu_flags unsigned long -#define acpi_thread_id u32 +#define acpi_thread_id struct task_struct * -static inline acpi_thread_id acpi_os_get_thread_id(void) { return 0; } +static inline acpi_thread_id acpi_os_get_thread_id(void) { return current; } #endif /* __ACLINUX_H__ */ |
