From f31ec725d52f9934afaef6d1b166997e06932263 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 11 Aug 2010 14:17:29 -0700
Subject: [PATCH] --- yaml --- r: 208894 b: refs/heads/master c:
 0a7992c90828a65281c3c9cf180be3b432d277b2 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/acpi/apei/erst.c        |  1 +
 trunk/include/acpi/platform/aclinux.h | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0b528fd15b62..e7189f7bd0dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d78a3eda6985e74bc21a23362f27526f73e71649
+refs/heads/master: 0a7992c90828a65281c3c9cf180be3b432d277b2
diff --git a/trunk/drivers/acpi/apei/erst.c b/trunk/drivers/acpi/apei/erst.c
index 864dd46c346f..18645f4e83cd 100644
--- a/trunk/drivers/acpi/apei/erst.c
+++ b/trunk/drivers/acpi/apei/erst.c
@@ -33,6 +33,7 @@
 #include <linux/uaccess.h>
 #include <linux/cper.h>
 #include <linux/nmi.h>
+#include <linux/hardirq.h>
 #include <acpi/apei.h>
 
 #include "apei-internal.h"
diff --git a/trunk/include/acpi/platform/aclinux.h b/trunk/include/acpi/platform/aclinux.h
index e5039a2856f8..103f08aca764 100644
--- a/trunk/include/acpi/platform/aclinux.h
+++ b/trunk/include/acpi/platform/aclinux.h
@@ -148,13 +148,17 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 #define ACPI_ALLOCATE_ZEROED(a) acpi_os_allocate_zeroed(a)
 #define ACPI_FREE(a)            kfree(a)
 
-/* Used within ACPICA to show where it is safe to preempt execution */
-#include <linux/hardirq.h>
+#ifndef CONFIG_PREEMPT
+/*
+ * Used within ACPICA to show where it is safe to preempt execution
+ * when CONFIG_PREEMPT=n
+ */
 #define ACPI_PREEMPTION_POINT() \
 	do { \
-		if (!in_atomic_preempt_off() && !irqs_disabled()) \
+		if (!irqs_disabled()) \
 			cond_resched(); \
 	} while (0)
+#endif
 
 #endif /* __KERNEL__ */