summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-01-20 01:14:50 -0500
committerLen Brown <len.brown@intel.com>2010-01-20 01:14:50 -0500
commit378fa825f63b026ecb8660370298d74678cac319 (patch)
tree7b4bf165e13cbac6bdce713330c3bfaa21bb1d21
parent093e2961fea5b3b1075dce5b0112c676206988da (diff)
parentc084ca704a3661bf77690a05bc6bd2c305d87c34 (diff)
downloadop-kernel-dev-378fa825f63b026ecb8660370298d74678cac319.zip
op-kernel-dev-378fa825f63b026ecb8660370298d74678cac319.tar.gz
Merge branch 'bugzilla-14483' into release
-rw-r--r--include/acpi/platform/aclinux.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 9d7febd..0946997 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 (!in_atomic_preempt_off() && !irqs_disabled()) \
cond_resched(); \
} while (0)
OpenPOWER on IntegriCloud