From: Greg KH on
2.6.32-stable review patch. If anyone has any objections, please let us know.


From: Xiaotian Feng <dfeng(a)>

commit c084ca704a3661bf77690a05bc6bd2c305d87c34 upstream.

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

This patch also fixes

Reported-and-bisected-by: Larry Finger <Larry.Finger(a)>
Reported-and-bisected-by: Justin P. Mattock <justinmattock(a)>
Signed-off-by: Xiaotian Feng <dfeng(a)>
Acked-by: Alexey Starikovskiy <astarikovskiy(a)>
Signed-off-by: Len Brown <len.brown(a)>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)>

include/acpi/platform/aclinux.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)
More majordomo info at
Please read the FAQ at