[lkml]   [2010]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[03/98] ACPI: dont cond_resched if irq is disabled
2.6.32-stable review patch.  If anyone has any objections, please let us know.


From: Xiaotian Feng <>

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 <>
Reported-and-bisected-by: Justin P. Mattock <>
Signed-off-by: Xiaotian Feng <>
Acked-by: Alexey Starikovskiy <>
Signed-off-by: Len Brown <>
Signed-off-by: Greg Kroah-Hartman <>

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)

 \ /
  Last update: 2010-01-27 00:45    [W:0.217 / U:1.524 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site