diff --git a/[refs] b/[refs]
index ef3845bdca7c..a9676d10e952 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: defba1d8f233c0d5cf3e1ea6aeb898eca7231860
+refs/heads/master: 3173cdfe02995f6c6841a28b5148f94cefd8ab77
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 4ece850b2af1..58e7c47354ee 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -1073,7 +1073,7 @@ acpi_native_uint acpi_os_acquire_lock(acpi_handle handle)
 
 void acpi_os_release_lock(acpi_handle handle, acpi_native_uint flags)
 {
-	spin_unlock_irqrestore((spinlock_t *) handle, flags);
+	spin_unlock_irqrestore((spinlock_t *) handle, (unsigned long) flags);
 }
 
 #ifndef ACPI_USE_LOCAL_CACHE