Merge branch 'bugzilla-14483' into release

This commit is contained in:
Len Brown 2010-01-20 01:14:50 -05:00
commit 378fa825f6

View file

@ -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)