From: Christophe Leroy Date: Mon, 17 Aug 2020 05:46:39 +0000 (+0000) Subject: powerpc/process: Remove unnecessary #ifdef CONFIG_FUNCTION_GRAPH_TRACER X-Git-Tag: v5.15~2571^2~180 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=353bce211e00d183344f464ba1ee0e1ffb0e2a6c;p=platform%2Fkernel%2Flinux-starfive.git powerpc/process: Remove unnecessary #ifdef CONFIG_FUNCTION_GRAPH_TRACER ftrace_graph_ret_addr() is always defined and returns 'ip' when CONFIG_FUNCTION GRAPH_TRACER is not set. So the #ifdef is not needed, remove it. Signed-off-by: Christophe Leroy Acked-by: Naveen N. Rao Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/9d11143d4e27ba8274369a926968756917584868.1597643153.git.christophe.leroy@csgroup.eu --- diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 016bd83..febe9f7 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -2096,10 +2096,8 @@ void show_stack(struct task_struct *tsk, unsigned long *stack, unsigned long sp, ip, lr, newsp; int count = 0; int firstframe = 1; -#ifdef CONFIG_FUNCTION_GRAPH_TRACER unsigned long ret_addr; int ftrace_idx = 0; -#endif if (tsk == NULL) tsk = current; @@ -2127,12 +2125,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack, if (!firstframe || ip != lr) { printk("%s["REG"] ["REG"] %pS", loglvl, sp, ip, (void *)ip); -#ifdef CONFIG_FUNCTION_GRAPH_TRACER ret_addr = ftrace_graph_ret_addr(current, &ftrace_idx, ip, stack); if (ret_addr != ip) pr_cont(" (%pS)", (void *)ret_addr); -#endif if (firstframe) pr_cont(" (unreliable)"); pr_cont("\n");