Merge branch 'preempt' into release

This commit is contained in:
Len Brown 2009-09-19 02:10:27 -04:00
commit 7ef0143e2f

View file

@ -149,10 +149,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
#define ACPI_FREE(a) kfree(a)
/* Used within ACPICA to show where it is safe to preempt execution */
#include <linux/hardirq.h>
#define ACPI_PREEMPTION_POINT() \
do { \
if (!irqs_disabled()) \
if (!in_atomic_preempt_off()) \
cond_resched(); \
} while (0)