Commit c084ca70 authored by Xiaotian Feng's avatar Xiaotian Feng Committed by Len Brown

ACPI: don't cond_resched if irq is disabled

commit 8bd108d1 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 abe1dfab by
don't cond_resched when irq_disabled. But recent commit 138d1569 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=14483Reported-and-bisected-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Reported-and-bisected-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
Signed-off-by: default avatarXiaotian Feng <dfeng@redhat.com>
Acked-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 22763c5c
...@@ -152,7 +152,7 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache) ...@@ -152,7 +152,7 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
#include <linux/hardirq.h> #include <linux/hardirq.h>
#define ACPI_PREEMPTION_POINT() \ #define ACPI_PREEMPTION_POINT() \
do { \ do { \
if (!in_atomic_preempt_off()) \ if (!in_atomic_preempt_off() && !irqs_disabled()) \
cond_resched(); \ cond_resched(); \
} while (0) } while (0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment