Commit 5e3f0d15 authored May 22, 2018 by Aneesh Kumar K.V Committed by Michael Ellerman May 29, 2018

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: df78d3f6 ("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>

parent 39b91dd6

arch/powerpc/kernel/stacktrace.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;