summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-19 02:10:27 -0400
committerLen Brown <len.brown@intel.com>2009-09-19 02:10:27 -0400
commit7ef0143e2f898f9bf675c81bdf0e045c8dd53c57 (patch)
tree6042d768a0d95afeddd50890246a8be1720b86ef /include/acpi
parent44396a262286d1a07216a7c7792d4ed7a4c89ea7 (diff)
parent138d15692bf76841f252d4b836a535cf5f9154e9 (diff)
downloadlinux-7ef0143e2f898f9bf675c81bdf0e045c8dd53c57.tar.bz2
Merge branch 'preempt' into release
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/platform/aclinux.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index fcb8e4b159b1..9d7febde10a1 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -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)