diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-12 21:59:19 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-12 21:59:19 +0300 |
| commit | 9d66a875ecc7d6dd414121e4508340d6c08f51b0 (patch) | |
| tree | d446bb455780d9058efe1760745bfb63207090de /kernel/trace/trace_stack.c | |
| parent | 987da3fe175933c28aab2293505c3597052ff0e2 (diff) | |
| parent | dd1dbf94d2826a045fbbe2649d84b27d48620d56 (diff) | |
| download | linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.xz | |
Merge branch 'acpi-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-intel
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); |