summaryrefslogtreecommitdiffstats
path: root/arch/sh/include
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-12-10 20:17:15 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-12-22 18:44:04 +0900
commitd7b01f78a3ae6a3cc21a16a1a3d377adc2227537 (patch)
treecfbc5b86b3e830792ac6e2a5140ef45f26ebaba2 /arch/sh/include
parentdd76279b47dce2c0bd7c54997938ec4cb9f16884 (diff)
downloadop-kernel-dev-d7b01f78a3ae6a3cc21a16a1a3d377adc2227537.zip
op-kernel-dev-d7b01f78a3ae6a3cc21a16a1a3d377adc2227537.tar.gz
sh: Enable HAVE_ARCH_TRACEHOOK for all SH, now that SH-5 supports it too.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
-rw-r--r--arch/sh/include/asm/processor_64.h2
-rw-r--r--arch/sh/include/asm/syscall_64.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/include/asm/processor_64.h b/arch/sh/include/asm/processor_64.h
index 96067e9..803177f 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 e95f3ae..e1143b9 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 */
OpenPOWER on IntegriCloud