aboutsummaryrefslogtreecommitdiff
path: root/include/linux/mmzone.h
diff options
context:
space:
mode:
authorGravatar Steven Rostedt <rostedt@goodmis.org> 2014-02-04 14:13:15 -0500
committerGravatar Ingo Molnar <mingo@kernel.org> 2014-02-09 13:09:08 +0100
commit569d6557ab957d6ae7e97a46ae669174be4189e6 (patch)
treece06766e54fdc96c68a61a2121e730df3f305a95 /include/linux/mmzone.h
parentMerge tag 'pinctrl-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-569d6557ab957d6ae7e97a46ae669174be4189e6.tar.gz
linux-569d6557ab957d6ae7e97a46ae669174be4189e6.tar.bz2
linux-569d6557ab957d6ae7e97a46ae669174be4189e6.zip
x86: Use preempt_disable_notrace() in cycles_2_ns()
When debug preempt is enabled, preempt_disable() can be traced by function and function graph tracing. There's a place in the function graph tracer that calls trace_clock() which eventually calls cycles_2_ns() outside of the recursion protection. When cycles_2_ns() calls preempt_disable() it gets traced and the graph tracer will go into a recursive loop causing a crash or worse, a triple fault. Simple fix is to use preempt_disable_notrace() in cycles_2_ns, which makes sense because the preempt_disable() tracing may use that code too, and it tracing it, even with recursion protection is rather pointless. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/20140204141315.2a968a72@gandalf.local.home Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/mmzone.h')
0 files changed, 0 insertions, 0 deletions