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