summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2015-09-28 18:09:19 +0200
committerIngo Molnar <mingo@kernel.org>2015-10-06 17:08:16 +0200
commit3d8f74dd4ca1da8a1a464bbafcf679e40c2fc10f (patch)
treed968b69e55f52f54a1439a6c72a1ce4054461b78 /include/linux
parentc73464b1c8434ad4cbfd5369c3e724f3e8ffe5a4 (diff)
downloadop-kernel-dev-3d8f74dd4ca1da8a1a464bbafcf679e40c2fc10f.zip
op-kernel-dev-3d8f74dd4ca1da8a1a464bbafcf679e40c2fc10f.tar.gz
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')
-rw-r--r--include/linux/preempt.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index bea8dd8..448dfd0 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -146,18 +146,6 @@ extern void preempt_count_sub(int val);
#define preempt_count_inc() preempt_count_add(1)
#define preempt_count_dec() preempt_count_sub(1)
-#define preempt_active_enter() \
-do { \
- preempt_count_add(PREEMPT_ACTIVE + PREEMPT_DISABLE_OFFSET); \
- barrier(); \
-} while (0)
-
-#define preempt_active_exit() \
-do { \
- barrier(); \
- preempt_count_sub(PREEMPT_ACTIVE + PREEMPT_DISABLE_OFFSET); \
-} while (0)
-
#ifdef CONFIG_PREEMPT_COUNT
#define preempt_disable() \
OpenPOWER on IntegriCloud