diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-10 10:52:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-10 10:52:40 +0100 |
| commit | cb1f34ddccb46f7c1bb61e98b7d44751a20c7e49 (patch) | |
| tree | 6cbcf7e9d87bc571b80ec1f75b5cb21a8e34b937 /kernel/trace/trace_stack.c | |
| parent | a555e9d86ee384d9d3cb3310a57aed33f7e053d4 (diff) | |
| parent | 541676078b52f365f53d46ee5517d305cd1b6350 (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 734accc02418..3c7bfc4bf5e9 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -209,6 +209,10 @@ stack_trace_call(unsigned long ip, unsigned long parent_ip, if (__this_cpu_read(disable_stack_tracer) != 1) goto out; + /* If rcu is not watching, then save stack trace can fail */ + if (!rcu_is_watching()) + goto out; + ip += MCOUNT_INSN_SIZE; check_stack(ip, &stack); |