powerpc/livepatch: Fix build error with kprobes disabled.
authorAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Tue, 22 May 2018 09:08:20 +0000 (14:38 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 29 May 2018 01:10:39 +0000 (11:10 +1000)
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>
arch/powerpc/kernel/stacktrace.c

index 26a5060..8dd6ba0 100644 (file)
@@ -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;