Patchwork ACPICA: don't cond_resched() when irq_disabled or in_atomic

login
register
mail settings
Submitter Xiaotian Feng
Date Dec. 4, 2009, 4:26 a.m.
Message ID <1259900760-6424-1-git-send-email-dfeng@redhat.com>
Download mbox | patch
Permalink /patch/64771/
State RFC, archived
Headers show

Comments

Patch

diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 9d7febd..5b415ee 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -152,7 +152,7 @@  static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 #include <linux/hardirq.h>
 #define ACPI_PREEMPTION_POINT() \
 	do { \
-		if (!in_atomic_preempt_off()) \
+		if (preemptible()) \
 			cond_resched(); \
 	} while (0)