summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>2018-05-22 05:08:20 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2018-05-28 21:10:39 -0400
commit5e3f0d15ae5f95bdde8d092a0884d2defe27d448 (patch)
tree8050020832dfe1bcfb2d826c388129891613f840
parent39b91dd625f15438859204a489ab62ef41d2be39 (diff)
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>
-rw-r--r--arch/powerpc/kernel/stacktrace.c3
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,
168 * arch-dependent code, they are generic. 168 * arch-dependent code, they are generic.
169 */ 169 */
170 ip = ftrace_graph_ret_addr(tsk, &graph_idx, ip, NULL); 170 ip = ftrace_graph_ret_addr(tsk, &graph_idx, ip, NULL);
171 171#ifdef CONFIG_KPROBES
172 /* 172 /*
173 * Mark stacktraces with kretprobed functions on them 173 * Mark stacktraces with kretprobed functions on them
174 * as unreliable. 174 * as unreliable.
175 */ 175 */
176 if (ip == (unsigned long)kretprobe_trampoline) 176 if (ip == (unsigned long)kretprobe_trampoline)
177 return 1; 177 return 1;
178#endif
178 179
179 if (!trace->skip) 180 if (!trace->skip)
180 trace->entries[trace->nr_entries++] = ip; 181 trace->entries[trace->nr_entries++] = ip;