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

Commit da7142e2 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched/core: Simplify preempt_count tests 



Since we stopped setting PREEMPT_ACTIVE, there is no need to mask it
out of preempt_count() tests.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Reviewed-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1dc0fffc

include/linux/preempt.h

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ 
 * Check whether we were atomic before we did preempt_disable():

 * (used by the scheduler)

 */

#define in_atomic_preempt_off() \

		((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_DISABLE_OFFSET)

#define in_atomic_preempt_off() (preempt_count() != PREEMPT_DISABLE_OFFSET)



#if defined(CONFIG_DEBUG_PREEMPT) || defined(CONFIG_PREEMPT_TRACER)

extern void preempt_count_add(int val);

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -7486,7 +7486,7 @@ void __init sched_init(void) 
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP

static inline int preempt_count_equals(int preempt_offset)

{

	int nested = (preempt_count() & ~PREEMPT_ACTIVE) + rcu_preempt_depth();

	int nested = preempt_count() + rcu_preempt_depth();



	return (nested == preempt_offset);

}