Skip to content

Commit

Permalink
ACPI: don't cond_resched() when irqs_disabled()
Browse files Browse the repository at this point in the history
The ACPI interpreter usually runs with irqs enabled.
However, during suspend/resume it runs with
irqs disabled to evaluate _GTS/_BFS, as well as
by irqrouter_resume() which evaluates _CRS, _PRS, _SRS.

http://bugzilla.kernel.org/show_bug.cgi?id=12252

Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Wu Fengguang authored and lenb committed Dec 19, 2008
1 parent e76f427 commit abe1dfa
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion include/acpi/platform/aclinux.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
/*
* We need to show where it is safe to preempt execution of ACPICA
*/
#define ACPI_PREEMPTION_POINT() cond_resched()
#define ACPI_PREEMPTION_POINT() \
do { \
if (!irqs_disabled()) \
cond_resched(); \
} while (0)

#endif /* __ACLINUX_H__ */

0 comments on commit abe1dfa

Please sign in to comment.