hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugzilla-14483' into release

This commit is contained in:
Len Brown 2010-01-20 01:14:50 -05:00
parent 093e2961fe c084ca704a
commit 378fa825f6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/acpi/platform/aclinux.h
View File

@ -152,7 +152,7 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
#include <linux/hardirq.h> #include <linux/hardirq.h>
#define ACPI_PREEMPTION_POINT() \ #define ACPI_PREEMPTION_POINT() \
do { \ do { \
if (!in_atomic_preempt_off()) \ if (!in_atomic_preempt_off() && !irqs_disabled()) \
cond_resched(); \ cond_resched(); \
} while (0) } while (0)