Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'preempt' into release

Len Brown 7ef0143e 44396a26

+2 -2
+2 -2
include/acpi/platform/aclinux.h
··· 149 149 #define ACPI_FREE(a) kfree(a) 150 150 151 151 /* Used within ACPICA to show where it is safe to preempt execution */ 152 - 152 + #include <linux/hardirq.h> 153 153 #define ACPI_PREEMPTION_POINT() \ 154 154 do { \ 155 - if (!irqs_disabled()) \ 155 + if (!in_atomic_preempt_off()) \ 156 156 cond_resched(); \ 157 157 } while (0) 158 158