Merge branch 'bugzilla-14483' into release

378fa825 · Len Brown · 093e2961 · c084ca70 · 378fa825
Commit 378fa825 authored Jan 20, 2010 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/acpi/platform/aclinux.h include/acpi/platform/aclinux.h +1 -1

No files found.
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -152,7 +152,7 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 #include <linux/hardirq.h>
 #define ACPI_PREEMPTION_POINT() \
 	do { \
-		if (!in_atomic_preempt_off()) \
+		if (!in_atomic_preempt_off() && !irqs_disabled()) \
 			cond_resched(); \
 	} while (0)