diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-01-29 11:51:57 +0200 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-01-29 11:51:57 +0200 |
| commit | 74c0167f8bcf02af8ff9f2677b2d85070ba7236d (patch) | |
| tree | 5a840e9abb2e49abd64180c48e6e77ce428b237c /kernel/trace/trace_stack.c | |
| parent | Revert "drm/i915: mark all device info struct with __initconst" (diff) | |
| parent | Merge tag 'drm-misc-next-fixes-2018-01-18' of git://anongit.freedesktop.org/d... (diff) | |
| download | linux-74c0167f8bcf02af8ff9f2677b2d85070ba7236d.tar.gz linux-74c0167f8bcf02af8ff9f2677b2d85070ba7236d.zip | |
Merge drm-next into drm-intel-next-queued
Pull 4.15 into drm-intel-next-queued for next feature pull.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
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); |