mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
ACPI: don't cond_resched if irq is disabled
commit8bd108d
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 commitabe1dfa
by don't cond_resched when irq_disabled. But recent commit138d156
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>
This commit is contained in:
parent
22763c5cf3
commit
c084ca704a
1 changed files with 1 additions and 1 deletions
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue