---

yaml
---
r: 33423
b: refs/heads/master
c: d68909f
h: refs/heads/master
i:
  33421: 130628f
  33419: 6226b8a
  33415: 3cfef47
  33407: a74fec0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5240b32b9b2b75917c478d768191862a2b190cc
+refs/heads/master: d68909f4c3eee09c13d4e5c86512c6c075553dbd

trunk/drivers/acpi/osl.c

@@ -746,6 +746,16 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Waiting for semaphore[%p|%d|%d]\n",
 			  handle, units, timeout));
 
+	/*
+	 * This can be called during resume with interrupts off.
+	 * Like boot-time, we should be single threaded and will
+	 * always get the lock if we try -- timeout or not.
+	 * If this doesn't succeed, then we will oops courtesy of
+	 * might_sleep() in down().
+	 */
+	if (!down_trylock(sem))
+		return AE_OK;
+
 	switch (timeout) {
 		/*
 		 * No Wait:

trunk/drivers/acpi/utils.c

@@ -262,7 +262,7 @@ acpi_evaluate_integer(acpi_handle handle,
 	if (!data)
 		return AE_BAD_PARAMETER;
 
-	element = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
+	element = kmalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
 	if (!element)
 		return AE_NO_MEMORY;