Merge branch 'bugzilla-14483' into release

git-mirror · Jan 20, 2010 · 378fa82 · 378fa82
2 parents 093e296 + c084ca7
commit 378fa82
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)