Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ef0143e authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'preempt' into release

parents 44396a26 138d1569

include/acpi/platform/aclinux.h

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