diff options
author | Peter Zijlstra <peterz@infradead.org> | 2015-09-28 12:09:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-10-06 11:08:16 -0400 |
commit | 3d8f74dd4ca1da8a1a464bbafcf679e40c2fc10f (patch) | |
tree | d968b69e55f52f54a1439a6c72a1ce4054461b78 /include/linux/preempt.h | |
parent | c73464b1c8434ad4cbfd5369c3e724f3e8ffe5a4 (diff) |
sched/core: Stop setting PREEMPT_ACTIVE
Now that nothing tests for PREEMPT_ACTIVE anymore, stop setting it.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Reviewed-by: Frederic 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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/preempt.h')
-rw-r--r-- | include/linux/preempt.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index bea8dd8ff5e0..448dfd0b2ea6 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h | |||
@@ -146,18 +146,6 @@ extern void preempt_count_sub(int val); | |||
146 | #define preempt_count_inc() preempt_count_add(1) | 146 | #define preempt_count_inc() preempt_count_add(1) |
147 | #define preempt_count_dec() preempt_count_sub(1) | 147 | #define preempt_count_dec() preempt_count_sub(1) |
148 | 148 | ||
149 | #define preempt_active_enter() \ | ||
150 | do { \ | ||
151 | preempt_count_add(PREEMPT_ACTIVE + PREEMPT_DISABLE_OFFSET); \ | ||
152 | barrier(); \ | ||
153 | } while (0) | ||
154 | |||
155 | #define preempt_active_exit() \ | ||
156 | do { \ | ||
157 | barrier(); \ | ||
158 | preempt_count_sub(PREEMPT_ACTIVE + PREEMPT_DISABLE_OFFSET); \ | ||
159 | } while (0) | ||
160 | |||
161 | #ifdef CONFIG_PREEMPT_COUNT | 149 | #ifdef CONFIG_PREEMPT_COUNT |
162 | 150 | ||
163 | #define preempt_disable() \ | 151 | #define preempt_disable() \ |