Skip to content

Commit 90b62b5

Browse files
fweisbecIngo Molnar
authored andcommitted
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: 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-4-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 2e10e71 commit 90b62b5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/linux/preempt.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@
8585
#define in_nmi() (preempt_count() & NMI_MASK)
8686

8787
#if defined(CONFIG_PREEMPT_COUNT)
88-
# define PREEMPT_CHECK_OFFSET 1
88+
# define PREEMPT_DISABLE_OFFSET 1
8989
#else
90-
# define PREEMPT_CHECK_OFFSET 0
90+
# define PREEMPT_DISABLE_OFFSET 0
9191
#endif
9292

9393
/*
@@ -103,7 +103,7 @@
103103
*
104104
* Work as expected.
105105
*/
106-
#define SOFTIRQ_LOCK_OFFSET (SOFTIRQ_DISABLE_OFFSET + PREEMPT_CHECK_OFFSET)
106+
#define SOFTIRQ_LOCK_OFFSET (SOFTIRQ_DISABLE_OFFSET + PREEMPT_DISABLE_OFFSET)
107107

108108
/*
109109
* Are we running in atomic context? WARNING: this macro cannot
@@ -119,7 +119,7 @@
119119
* (used by the scheduler, *after* releasing the kernel lock)
120120
*/
121121
#define in_atomic_preempt_off() \
122-
((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_CHECK_OFFSET)
122+
((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_DISABLE_OFFSET)
123123

124124
#if defined(CONFIG_DEBUG_PREEMPT) || defined(CONFIG_PREEMPT_TRACER)
125125
extern void preempt_count_add(int val);

0 commit comments

Comments
 (0)