powerpc/ftrace: Remove mod_return_to_handler

mod_return_to_handler is the same as return_to_handler, except
it handles the change of the TOC (r2). Add this into
return_to_handler and remove mod_return_to_handler.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

1 files changed, 1 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 8c2691e445bd..f6b82152e7aa 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1527,13 +1527,6 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
         int curr_frame = current->curr_ret_stack;
         extern void return_to_handler(void);
         unsigned long rth = (unsigned long)return_to_handler;
-        unsigned long mrth = -1;
-#ifdef CONFIG_PPC64
-        extern void mod_return_to_handler(void);
-        rth = *(unsigned long *)rth;
-        mrth = (unsigned long)mod_return_to_handler;
-        mrth = *(unsigned long *)mrth;
-#endif
 #endif
 
         sp = (unsigned long) stack;
@@ -1558,7 +1551,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
                 if (!firstframe || ip != lr) {
                         printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-                        if ((ip == rth || ip == mrth) && curr_frame >= 0) {
+                        if ((ip == rth) && curr_frame >= 0) {
                                 printk(" (%pS)",
                                        (void *)current->ret_stack[curr_frame].ret);
                                 curr_frame--;