sh: prefer _THIS_IP_ to current_text_addr

As part of the effort to reduce the code duplication between _THIS_IP_
and current_text_addr(), let's consolidate callers of
current_text_addr() to use _THIS_IP_.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Nick Desaulniers <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Cc: Rich Felker <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/sh/include/asm/kexec.h b/arch/sh/include/asm/kexec.h
index fd5f331a39126d2aca7d9c16852c80cd24931bf3..927d80ba2332a73dd5ebfb3760b2b2b5137c86bb 100644 (file)
--- a/arch/sh/include/asm/kexec.h
+++ b/arch/sh/include/asm/kexec.h
@@ -4,6 +4,7 @@
 
 #include <asm/ptrace.h>
 #include <asm/string.h>
+#include <linux/kernel.h>
 
 /*
  * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
@@ -61,7 +62,7 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
                __asm__ __volatile__ ("stc gbr, %0" : "=r" (newregs->gbr));
                __asm__ __volatile__ ("stc sr, %0" : "=r" (newregs->sr));
 
-               newregs->pc = (unsigned long)current_text_addr();
+               newregs->pc = _THIS_IP_;
        }
 }
 #else

diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c
index 1a2526676a8729b08b87c3955ed7ba007c5e531c..bb511e2d9d68131c65e68b400ef662527069a751 100644 (file)
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@ -599,7 +599,7 @@ struct dwarf_frame *dwarf_unwind_stack(unsigned long pc,
         * time this function makes its first function call.
         */
        if (!pc || !prev)
-               pc = (unsigned long)current_text_addr();
+               pc = _THIS_IP_;
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
        /*