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 <christophe.le...@csgroup.eu>
---
 arch/powerpc/kernel/process.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index ffbe79960c73..e86e28c28259 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");
-- 
2.25.0

Reply via email to