projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[BNX2]: Move .h files to bnx2.c
[powerpc.git]
/
drivers
/
acpi
/
osl.c
diff --git
a/drivers/acpi/osl.c
b/drivers/acpi/osl.c
index
e3cd0b1
..
ac5bbae
100644
(file)
--- a/
drivers/acpi/osl.c
+++ b/
drivers/acpi/osl.c
@@
-204,11
+204,13
@@
acpi_os_map_memory(acpi_physical_address phys, acpi_size size,
return AE_OK;
}
return AE_OK;
}
+EXPORT_SYMBOL_GPL(acpi_os_map_memory);
void acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
{
iounmap(virt);
}
void acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
{
iounmap(virt);
}
+EXPORT_SYMBOL_GPL(acpi_os_unmap_memory);
#ifdef ACPI_FUTURE_USAGE
acpi_status
#ifdef ACPI_FUTURE_USAGE
acpi_status
@@
-836,7
+838,7
@@
acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
static const int quantum_ms = 1000 / HZ;
ret = down_trylock(sem);
static const int quantum_ms = 1000 / HZ;
ret = down_trylock(sem);
- for (i = timeout; (i > 0 && ret
<
0); i -= quantum_ms) {
+ for (i = timeout; (i > 0 && ret
!=
0); i -= quantum_ms) {
schedule_timeout_interruptible(1);
ret = down_trylock(sem);
}
schedule_timeout_interruptible(1);
ret = down_trylock(sem);
}
@@
-1058,13
+1060,11
@@
EXPORT_SYMBOL(max_cstate);
* Acquire a spinlock.
*
* handle is a pointer to the spinlock_t.
* Acquire a spinlock.
*
* handle is a pointer to the spinlock_t.
- * flags is *not* the result of save_flags - it is an ACPI-specific flag variable
- * that indicates whether we are at interrupt level.
*/
*/
-
unsigned long
acpi_os_acquire_lock(acpi_handle handle)
+
acpi_cpu_flags
acpi_os_acquire_lock(acpi_handle handle)
{
{
-
unsigned long
flags;
+
acpi_cpu_flags
flags;
spin_lock_irqsave((spinlock_t *) handle, flags);
return flags;
}
spin_lock_irqsave((spinlock_t *) handle, flags);
return flags;
}
@@
-1073,7
+1073,7
@@
unsigned long acpi_os_acquire_lock(acpi_handle handle)
* Release a spinlock. See above.
*/
* Release a spinlock. See above.
*/
-void acpi_os_release_lock(acpi_handle handle,
unsigned long
flags)
+void acpi_os_release_lock(acpi_handle handle,
acpi_cpu_flags
flags)
{
spin_unlock_irqrestore((spinlock_t *) handle, flags);
}
{
spin_unlock_irqrestore((spinlock_t *) handle, flags);
}