From 5363866bd0ab2739603e5352fbf7b1cea3a24bac Mon Sep 17 00:00:00 2001
From: Wu Fengguang <fengguang.wu@intel.com>
Date: Wed, 26 Nov 2008 14:35:22 +0800
Subject: [PATCH] --- yaml --- r: 120013 b: refs/heads/master c:
 abe1dfab60e1839d115930286cb421f5a5b193f3 h: refs/heads/master i:   120011:
 8fdb5c0d5113d06b0ce797680cba1b3f835b8855 v: v3

---
 [refs]                                | 2 +-
 trunk/include/acpi/platform/aclinux.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 323e45822d28..56bd8c44ab75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e76f42761197dd6e9405e2eeb35932acfede115a
+refs/heads/master: abe1dfab60e1839d115930286cb421f5a5b193f3
diff --git a/trunk/include/acpi/platform/aclinux.h b/trunk/include/acpi/platform/aclinux.h
index 029c8c06c151..0515e754449d 100644
--- a/trunk/include/acpi/platform/aclinux.h
+++ b/trunk/include/acpi/platform/aclinux.h
@@ -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__ */