Commit 378fa825 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bugzilla-14483' into release

parents 093e2961 c084ca70

include/acpi/platform/aclinux.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE