Merge branch 'bugzilla-14483' into release

2010-01-20 01:14:50 -05:00 · 2010-01-20 01:14:50 -05:00 · 378fa825f6
parent 093e2961fe c084ca704a
commit 378fa825f6
1 changed files with 1 additions and 1 deletions
--- 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)