[PATCH] powerpc/kprobes: Fix build error with kprobes disabled.

Subsystems: linux for powerpc (32-bit and 64-bit), the rest

STALE3001d

2 messages, 2 authors, 2018-06-01 · open the first message on its own page

[PATCH] powerpc/kprobes: Fix build error with kprobes disabled.

From: Aneesh Kumar K.V <hidden>
Date: 2018-05-22 09:08:49

arch/powerpc/kernel/stacktrace.c: In function ‘save_stack_trace_tsk_reliable’:
arch/powerpc/kernel/stacktrace.c:176:28: error: ‘kretprobe_trampoline’ undeclared (first use in this function); did you mean ‘is_ftrace_trampoline’?
   if (ip == (unsigned long)kretprobe_trampoline)
                            ^~~~~~~~~~~~~~~~~~~~
                            is_ftrace_trampoline
arch/powerpc/kernel/stacktrace.c:176:28: note: each undeclared identifier is reported only once for each function it appears in

Signed-off-by: Aneesh Kumar K.V <redacted>
---
 arch/powerpc/kernel/stacktrace.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
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;
-- 
2.17.0

Re: powerpc/kprobes: Fix build error with kprobes disabled.

From: Michael Ellerman <hidden>
Date: 2018-06-01 15:54:58

On Tue, 2018-05-22 at 09:08:20 UTC, "Aneesh Kumar K.V" wrote:
arch/powerpc/kernel/stacktrace.c: In function ���save_stack_trace_tsk_reliable���:
arch/powerpc/kernel/stacktrace.c:176:28: error: ���kretprobe_trampoline��� undeclared (first use in this function); did you mean ���is_ftrace_trampoline���?
   if (ip == (unsigned long)kretprobe_trampoline)
                            ^~~~~~~~~~~~~~~~~~~~
                            is_ftrace_trampoline
arch/powerpc/kernel/stacktrace.c:176:28: note: each undeclared identifier is reported only once for each function it appears in

Signed-off-by: Aneesh Kumar K.V <redacted>
Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/5e3f0d15ae5f95bdde8d092a0884d2

cheers
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help