[03/98] ACPI: dont cond_resched if irq is disabled
in [Kernel]
|
Prev: [07/98] [SCSI] mpt2sas: New device SAS2208 support is added
Next: linux-next: manual merge of the gfs2 tree with the vfs tree
From: Greg KH on 26 Jan 2010 19:10 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Xiaotian Feng <dfeng(a)redhat.com> 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 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(a)lwfinger.net> Reported-and-bisected-by: Justin P. Mattock <justinmattock(a)gmail.com> Signed-off-by: Xiaotian Feng <dfeng(a)redhat.com> Acked-by: Alexey Starikovskiy <astarikovskiy(a)suse.de> Signed-off-by: Len Brown <len.brown(a)intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- 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> #define ACPI_PREEMPTION_POINT() \ 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)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |