diff options
| author | Xiaotian Feng <dfeng@redhat.com> | 2009-12-10 19:56:45 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-01-16 01:35:36 -0500 |
| commit | c084ca704a3661bf77690a05bc6bd2c305d87c34 (patch) | |
| tree | 0d9bc73abcb2fa5cc904162cc3c599555fe121eb /include/acpi | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| download | talos-obmc-linux-c084ca704a3661bf77690a05bc6bd2c305d87c34.tar.gz talos-obmc-linux-c084ca704a3661bf77690a05bc6bd2c305d87c34.zip | |
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 <Larry.Finger@lwfinger.net>
Reported-and-bisected-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/platform/aclinux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 9d7febde10a1..09469971472f 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -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) |
