sh: Enable HAVE_ARCH_TRACEHOOK for all SH, now that SH-5 supports it too.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 4 insertions, 4 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 6462109acc70..ff7a1f358a36 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -13,6 +13,7 @@ config SUPERH
         select HAVE_OPROFILE
         select HAVE_GENERIC_DMA_COHERENT
         select HAVE_IOREMAP_PROT if MMU
+        select HAVE_ARCH_TRACEHOOK
         help
           The SuperH is a RISC processor targeted for use in embedded systems
           and consumer electronics; it was also used in the Sega Dreamcast
@@ -23,7 +24,6 @@ config SUPERH32
         def_bool !SUPERH64
         select HAVE_KPROBES
         select HAVE_KRETPROBES
-        select HAVE_ARCH_TRACEHOOK
         select HAVE_FUNCTION_TRACER
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_DYNAMIC_FTRACE
diff --git a/arch/sh/include/asm/processor_64.h b/arch/sh/include/asm/processor_64.h
index 96067e9397ea..803177fcf086 100644
--- a/arch/sh/include/asm/processor_64.h
+++ b/arch/sh/include/asm/processor_64.h
@@ -226,7 +226,7 @@ extern unsigned long get_wchan(struct task_struct *p);
 #define KSTK_EIP(tsk)  ((tsk)->thread.pc)
 #define KSTK_ESP(tsk)  ((tsk)->thread.sp)
 
-#define user_stack_pointer(regs)        ((regs)->sp)
+#define user_stack_pointer(regs)        ((regs)->regs[15])
 
 #endif  /* __ASSEMBLY__ */
 #endif /* __ASM_SH_PROCESSOR_64_H */
diff --git a/arch/sh/include/asm/syscall_64.h b/arch/sh/include/asm/syscall_64.h
index e95f3ae30aff..e1143b9784d6 100644
--- a/arch/sh/include/asm/syscall_64.h
+++ b/arch/sh/include/asm/syscall_64.h
@@ -65,7 +65,7 @@ static inline void syscall_get_arguments(struct task_struct *task,
                                          unsigned long *args)
 {
         BUG_ON(i + n > 6);
-        memcpy(args, &regs->reg[2 + i], n * sizeof(args[0]));
+        memcpy(args, &regs->regs[2 + i], n * sizeof(args[0]));
 }
 
 static inline void syscall_set_arguments(struct task_struct *task,
@@ -74,7 +74,7 @@ static inline void syscall_set_arguments(struct task_struct *task,
                                          const unsigned long *args)
 {
         BUG_ON(i + n > 6);
-        memcpy(&regs->reg[2 + i], args, n * sizeof(args[0]));
+        memcpy(&regs->regs[2 + i], args, n * sizeof(args[0]));
 }
 
 #endif /* __ASM_SH_SYSCALL_64_H */