diff mbox

[1/3] ACPICA: Don't switch task then not allowed

Message ID 20090828192938.19961.63714.stgit@thinkpad (mailing list archive)
State Accepted
Headers show

Commit Message

Alexey Starikovskiy Aug. 28, 2009, 7:29 p.m. UTC
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
---

 include/acpi/platform/aclinux.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Len Brown Aug. 29, 2009, 6:41 p.m. UTC | #1
applied to acpi-test

again, this could use a check-in commment,
eg. citing the e-mail discussion of the failure
that this addresses

thanks,
Len Brown, Intel Open Source Technology Center

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index fcb8e4b..9d7febd 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)