| commit | 378fa825f63b026ecb8660370298d74678cac319 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Wed Jan 20 01:14:50 2010 -0500 |
| committer | Len Brown <len.brown@intel.com> | Wed Jan 20 01:14:50 2010 -0500 |
| tree | 7b4bf165e13cbac6bdce713330c3bfaa21bb1d21 | |
| parent | 093e2961fea5b3b1075dce5b0112c676206988da [diff] | |
| parent | c084ca704a3661bf77690a05bc6bd2c305d87c34 [diff] |
Merge branch 'bugzilla-14483' into release
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 @@ #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)