projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and 'x86-debug-for...
[cascardo/linux.git]
/
arch
/
mips
/
kernel
/
ftrace.c
diff --git
a/arch/mips/kernel/ftrace.c
b/arch/mips/kernel/ftrace.c
index
60e7e5e
..
8b65387
100644
(file)
--- a/
arch/mips/kernel/ftrace.c
+++ b/
arch/mips/kernel/ftrace.c
@@
-302,6
+302,9
@@
void prepare_ftrace_return(unsigned long *parent_ra_addr, unsigned long self_ra,
&return_to_handler;
int faulted, insns;
+ if (unlikely(ftrace_graph_is_dead()))
+ return;
+
if (unlikely(atomic_read(¤t->tracing_graph_pause)))
return;