diff options
| author |   Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> | 2018-05-22 14:38:20 +0530 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2018-05-29 11:10:39 +1000 |
| commit | 5e3f0d15ae5f95bdde8d092a0884d2defe27d448 (patch) | |
| tree | 8050020832dfe1bcfb2d826c388129891613f840 /arch/powerpc/kernel/stacktrace.c | |
| parent | selftests/powerpc: Add core file test for Protection Key registers (diff) | |
| download | linux-dev-5e3f0d15ae5f95bdde8d092a0884d2defe27d448.tar.xz linux-dev-5e3f0d15ae5f95bdde8d092a0884d2defe27d448.zip | |
powerpc/livepatch: Fix build error with kprobes disabled.
arch/powerpc/kernel/stacktrace.c: In function ‘save_stack_trace_tsk_reliable’:
arch/powerpc/kernel/stacktrace.c:176:28: error: ‘kretprobe_trampoline’ undeclared
if (ip == (unsigned long)kretprobe_trampoline)
^~~~~~~~~~~~~~~~~~~~
Fixes: df78d3f61480 ("powerpc/livepatch: Implement reliable stack tracing for the consistency model")
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/stacktrace.c')
| -rw-r--r-- | arch/powerpc/kernel/stacktrace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/stacktrace.c b/arch/powerpc/kernel/stacktrace.c index 26a50603177c..8dd6ba0c7d35 100644 --- a/arch/powerpc/kernel/stacktrace.c +++ b/arch/powerpc/kernel/stacktrace.c @@ -168,13 +168,14 @@ save_stack_trace_tsk_reliable(struct task_struct *tsk, * arch-dependent code, they are generic. */ ip = ftrace_graph_ret_addr(tsk, &graph_idx, ip, NULL); - +#ifdef CONFIG_KPROBES /* * Mark stacktraces with kretprobed functions on them * as unreliable. */ if (ip == (unsigned long)kretprobe_trampoline) return 1; +#endif if (!trace->skip) trace->entries[trace->nr_entries++] = ip; |