diff options
| author | Len Brown <len.brown@intel.com> | 2010-01-20 09:14:50 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-01-20 09:14:50 +0300 |
| commit | 378fa825f63b026ecb8660370298d74678cac319 (patch) | |
| tree | 7b4bf165e13cbac6bdce713330c3bfaa21bb1d21 /include/acpi | |
| parent | 093e2961fea5b3b1075dce5b0112c676206988da (diff) | |
| parent | c084ca704a3661bf77690a05bc6bd2c305d87c34 (diff) | |
| download | linux-378fa825f63b026ecb8660370298d74678cac319.tar.xz | |
Merge branch 'bugzilla-14483' into release
Diffstat (limited to 'include/acpi')
| -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) #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) |