diff options
| author | Len Brown <len.brown@intel.com> | 2010-01-20 01:14:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-01-20 01:14:50 -0500 |
| commit | 378fa825f63b026ecb8660370298d74678cac319 (patch) | |
| tree | 7b4bf165e13cbac6bdce713330c3bfaa21bb1d21 | |
| parent | 093e2961fea5b3b1075dce5b0112c676206988da (diff) | |
| parent | c084ca704a3661bf77690a05bc6bd2c305d87c34 (diff) | |
Merge branch 'bugzilla-14483' into release
| -rw-r--r-- | include/acpi/platform/aclinux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 9d7febde10a1..09469971472f 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) | |||
| 152 | #include <linux/hardirq.h> | 152 | #include <linux/hardirq.h> |
| 153 | #define ACPI_PREEMPTION_POINT() \ | 153 | #define ACPI_PREEMPTION_POINT() \ |
| 154 | do { \ | 154 | do { \ |
| 155 | if (!in_atomic_preempt_off()) \ | 155 | if (!in_atomic_preempt_off() && !irqs_disabled()) \ |
| 156 | cond_resched(); \ | 156 | cond_resched(); \ |
| 157 | } while (0) | 157 | } while (0) |
| 158 | 158 | ||