ACPI: don't cond_resched if irq is disabled

commit 8bd108d adds preemption point after each opcode parse, then
a sleeping function called from invalid context bug was founded
during suspend/resume stage. this was fixed in commit abe1dfa by
don't cond_resched when irq_disabled. But recent commit 138d156 changes
the behaviour to don't cond_resched when in_atomic. This makes the
sleeping function called from invalid context bug happen again, which
is reported in http://lkml.org/lkml/2009/12/1/371.

This patch also fixes http://bugzilla.kernel.org/show_bug.cgi?id=14483

Reported-and-bisected-by: Larry Finger <[email protected]>
Reported-and-bisected-by: Justin P. Mattock <[email protected]>
Signed-off-by: Xiaotian Feng <[email protected]>
Acked-by: Alexey Starikovskiy <[email protected]>
Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
Xiaotian Feng 2009-12-10 19:56:45 +08:00 • committed by Len Brown
commit c084ca704a

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)