Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abe1dfab authored by Wu Fengguang's avatar Wu Fengguang Committed by Len Brown
Browse files

ACPI: don't cond_resched() when irqs_disabled()

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: default avatarWu Fengguang <wfg@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e76f4276
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -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__ */