mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-15 06:55:13 +08:00
Merge branch 'preempt' into release
This commit is contained in:
commit
7ef0143e2f
@ -149,10 +149,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
|
||||
#define ACPI_FREE(a) kfree(a)
|
||||
|
||||
/* Used within ACPICA to show where it is safe to preempt execution */
|
||||
|
||||
#include <linux/hardirq.h>
|
||||
#define ACPI_PREEMPTION_POINT() \
|
||||
do { \
|
||||
if (!irqs_disabled()) \
|
||||
if (!in_atomic_preempt_off()) \
|
||||
cond_resched(); \
|
||||
} while (0)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user