aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-12-10 06:17:15 -0500
committerPaul Mundt <lethal@linux-sh.org>2008-12-22 04:44:04 -0500
commitd7b01f78a3ae6a3cc21a16a1a3d377adc2227537 (patch)
treecfbc5b86b3e830792ac6e2a5140ef45f26ebaba2 /arch/sh/include
parentdd76279b47dce2c0bd7c54997938ec4cb9f16884 (diff)
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 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);
226#define KSTK_EIP(tsk) ((tsk)->thread.pc) 226#define KSTK_EIP(tsk) ((tsk)->thread.pc)
227#define KSTK_ESP(tsk) ((tsk)->thread.sp) 227#define KSTK_ESP(tsk) ((tsk)->thread.sp)
228 228
229#define user_stack_pointer(regs) ((regs)->sp) 229#define user_stack_pointer(regs) ((regs)->regs[15])
230 230
231#endif /* __ASSEMBLY__ */ 231#endif /* __ASSEMBLY__ */
232#endif /* __ASM_SH_PROCESSOR_64_H */ 232#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,
65 unsigned long *args) 65 unsigned long *args)
66{ 66{
67 BUG_ON(i + n > 6); 67 BUG_ON(i + n > 6);
68 memcpy(args, &regs->reg[2 + i], n * sizeof(args[0])); 68 memcpy(args, &regs->regs[2 + i], n * sizeof(args[0]));
69} 69}
70 70
71static inline void syscall_set_arguments(struct task_struct *task, 71static inline void syscall_set_arguments(struct task_struct *task,
@@ -74,7 +74,7 @@ static inline void syscall_set_arguments(struct task_struct *task,
74 const unsigned long *args) 74 const unsigned long *args)
75{ 75{
76 BUG_ON(i + n > 6); 76 BUG_ON(i + n > 6);
77 memcpy(&regs->reg[2 + i], args, n * sizeof(args[0])); 77 memcpy(&regs->regs[2 + i], args, n * sizeof(args[0]));
78} 78}
79 79
80#endif /* __ASM_SH_SYSCALL_64_H */ 80#endif /* __ASM_SH_SYSCALL_64_H */