summaryrefslogtreecommitdiffstats
path: root/include/linux/preempt.h
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2015-06-04 17:39:08 +0200
committerIngo Molnar <mingo@kernel.org>2015-06-07 15:57:42 +0200
commit4eaca0a887eaee04fc7a3866d0f5b51b34030dfa (patch)
tree82ebaa639373c69aad063040cb87228fe5a0645c /include/linux/preempt.h
parentbe690035df893385ceaac2323b29be1fb7f2a67f (diff)
downloadlinux-4eaca0a887eaee04fc7a3866d0f5b51b34030dfa.tar.gz
linux-4eaca0a887eaee04fc7a3866d0f5b51b34030dfa.tar.bz2
linux-4eaca0a887eaee04fc7a3866d0f5b51b34030dfa.zip
preempt: Use preempt_schedule_context() as the official tracing preemption point
preempt_schedule_context() is a tracing safe preemption point but it's only used when CONFIG_CONTEXT_TRACKING=y. Other configs have tracing recursion issues since commit: b30f0e3ffedf ("sched/preempt: Optimize preemption operations on __schedule() callers") introduced function based preemp_count_*() ops. Lets make it available on all configs and give it a more appropriate name for its new position. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1433432349-1021-3-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/preempt.h')
-rw-r--r--include/linux/preempt.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index a1a00e14c14f..7686dd63bc35 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -204,15 +204,11 @@ do { \
#ifdef CONFIG_PREEMPT
-#ifndef CONFIG_CONTEXT_TRACKING
-#define __preempt_schedule_context() __preempt_schedule()
-#endif
-
#define preempt_enable_notrace() \
do { \
barrier(); \
if (unlikely(__preempt_count_dec_and_test())) \
- __preempt_schedule_context(); \
+ __preempt_schedule_notrace(); \
} while (0)
#else
#define preempt_enable_notrace() \