Commit 3e51f3c4 authored May 12, 2015 by Frederic Weisbecker Committed by Ingo Molnar May 19, 2015

sched/preempt: Remove PREEMPT_ACTIVE unmasking off in_atomic()



Now that PREEMPT_ACTIVE implies PREEMPT_DISABLE_OFFSET, ignoring
PREEMPT_ACTIVE from in_atomic() check isn't useful anymore.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1431441711-29753-7-git-send-email-fweisbec@gmail.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent e017cf21

include/linux/preempt.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@
		* used in the general case to determine whether sleeping is possible.
		* Do not use in_atomic() in driver code.
		*/
		#define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != 0)
		#define in_atomic() (preempt_count() != 0)

		/*
		* Check whether we were atomic before we did preempt_disable():