Commit 99686994 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] acpi compile fix

ACPI is performing a spin_lock() on a `void *'.  That's OK when spin_lock is
implemented via an inline function.  But when it is implemented via macros
it causes compile-time breakage.

So cast it to the right type. It really should be fixed not to use opaque
handles, though.
parent b1ffe92e
...@@ -736,7 +736,7 @@ acpi_os_acquire_lock ( ...@@ -736,7 +736,7 @@ acpi_os_acquire_lock (
if (flags & ACPI_NOT_ISR) if (flags & ACPI_NOT_ISR)
ACPI_DISABLE_IRQS(); ACPI_DISABLE_IRQS();
spin_lock(handle); spin_lock((spinlock_t *)handle);
return_VOID; return_VOID;
} }
...@@ -755,7 +755,7 @@ acpi_os_release_lock ( ...@@ -755,7 +755,7 @@ acpi_os_release_lock (
ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Releasing spinlock[%p] from %s level\n", handle, ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Releasing spinlock[%p] from %s level\n", handle,
((flags & ACPI_NOT_ISR) ? "non-interrupt" : "interrupt"))); ((flags & ACPI_NOT_ISR) ? "non-interrupt" : "interrupt")));
spin_unlock(handle); spin_unlock((spinlock_t *)handle);
if (flags & ACPI_NOT_ISR) if (flags & ACPI_NOT_ISR)
ACPI_ENABLE_IRQS(); ACPI_ENABLE_IRQS();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment