diff options
| author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2009-08-28 15:29:38 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-08-29 14:41:27 -0400 |
| commit | 138d15692bf76841f252d4b836a535cf5f9154e9 (patch) | |
| tree | df5d81076d4e4c74d51f3ed16146f245f34e8f8e | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
ACPICA: Don't switch task then not allowed
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | include/acpi/platform/aclinux.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index fcb8e4b159b1..9d7febde10a1 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h | |||
| @@ -149,10 +149,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache) | |||
| 149 | #define ACPI_FREE(a) kfree(a) | 149 | #define ACPI_FREE(a) kfree(a) |
| 150 | 150 | ||
| 151 | /* Used within ACPICA to show where it is safe to preempt execution */ | 151 | /* Used within ACPICA to show where it is safe to preempt execution */ |
| 152 | 152 | #include <linux/hardirq.h> | |
| 153 | #define ACPI_PREEMPTION_POINT() \ | 153 | #define ACPI_PREEMPTION_POINT() \ |
| 154 | do { \ | 154 | do { \ |
| 155 | if (!irqs_disabled()) \ | 155 | if (!in_atomic_preempt_off()) \ |
| 156 | cond_resched(); \ | 156 | cond_resched(); \ |
| 157 | } while (0) | 157 | } while (0) |
| 158 | 158 | ||
