[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1259900760-6424-1-git-send-email-dfeng@redhat.com>
Date: Fri, 4 Dec 2009 12:26:00 +0800
From: Xiaotian Feng <dfeng@...hat.com>
To: lenb@...nel.org, ming.m.lin@...el.com, robert.moore@...el.com,
linux-acpi@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Xiaotian Feng <dfeng@...hat.com>
Subject: [PATCH] ACPICA: don't cond_resched() when irq_disabled or in_atomic
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.
The fix is to cond_sched() only when preemptible, which means not in
irq_disabled or in_atomic.
Reported-and-bisected-by: Larry Finger <Larry.Finger@...inger.net>
Signed-off-by: Xiaotian Feng <dfeng@...hat.com>
---
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 9d7febd..5b415ee 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 (preemptible()) \
cond_resched(); \
} while (0)
--
1.6.5.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists