X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Facpi%2Fplatform%2Faclinux.h;h=0515e754449d13bd8d10fddb3f6b92ad6f6e5fd0;hb=abe1dfab60e1839d115930286cb421f5a5b193f3;hp=029c8c06c151ab4f7153d4aeb143bb51ed4d258c;hpb=e76f42761197dd6e9405e2eeb35932acfede115a;p=linux-2.6-omap-h63xx.git

diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 029c8c06c15..0515e754449 100644
--- a/include/acpi/platform/aclinux.h
+++ b/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__ */