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

Commit 90b62b51 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

sched/preempt: Rename PREEMPT_CHECK_OFFSET to PREEMPT_DISABLE_OFFSET 



"CHECK" suggests it's only used as a comparison mask. But now it's used
further as a config-conditional preempt disabler offset. Lets
disambiguate this name.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarPeter 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-4-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 2e10e71c

include/linux/preempt.h

+4 −4
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ 
#define in_nmi()	(preempt_count() & NMI_MASK)



#if defined(CONFIG_PREEMPT_COUNT)

# define PREEMPT_CHECK_OFFSET 1

# define PREEMPT_DISABLE_OFFSET 1

#else

# define PREEMPT_CHECK_OFFSET 0

# define PREEMPT_DISABLE_OFFSET 0

#endif



/*
@@ -103,7 +103,7 @@ 
 *

 * Work as expected.

 */

#define SOFTIRQ_LOCK_OFFSET (SOFTIRQ_DISABLE_OFFSET + PREEMPT_CHECK_OFFSET)

#define SOFTIRQ_LOCK_OFFSET (SOFTIRQ_DISABLE_OFFSET + PREEMPT_DISABLE_OFFSET)



/*

 * Are we running in atomic context?  WARNING: this macro cannot
@@ -119,7 +119,7 @@ 
 * (used by the scheduler, *after* releasing the kernel lock)

 */

#define in_atomic_preempt_off() \

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

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



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

extern void preempt_count_add(int val);