forked from luck/tmp_suning_uos_patched
Merge branch 'bugzilla-14483' into release
This commit is contained in:
commit
378fa825f6
|
@ -152,7 +152,7 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
|
|||
#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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user