projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
[deliverable/linux.git]
/
arch
/
sh
/
kernel
/
ftrace.c
diff --git
a/arch/sh/kernel/ftrace.c
b/arch/sh/kernel/ftrace.c
index 3c74f53db6db93fca6e6399062fbbc16d457caa0..079d70e6d74b3122adb2f48bebd8056ac4262e4a 100644
(file)
--- a/
arch/sh/kernel/ftrace.c
+++ b/
arch/sh/kernel/ftrace.c
@@
-344,6
+344,9
@@
void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
struct ftrace_graph_ent trace;
unsigned long return_hooker = (unsigned long)&return_to_handler;
+ if (unlikely(ftrace_graph_is_dead()))
+ return;
+
if (unlikely(atomic_read(¤t->tracing_graph_pause)))
return;
This page took
0.033741 seconds
and
5
git commands to generate.