From 6eecfd6f45284d19662ee341d6c656649c723316 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 10 Dec 2008 20:17:15 +0900 Subject: [PATCH] --- yaml --- r: 120115 b: refs/heads/master c: d7b01f78a3ae6a3cc21a16a1a3d377adc2227537 h: refs/heads/master i: 120113: c1ed461a7a11832d1a798a1bbae64b2fcf7cb9a6 120111: 055dbb76b70ed859648ec9b7f563ab075d8e8ec8 v: v3 --- [refs] | 2 +- trunk/arch/sh/Kconfig | 2 +- trunk/arch/sh/include/asm/processor_64.h | 2 +- trunk/arch/sh/include/asm/syscall_64.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6c34976452fa..7fbb4b939fe1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd76279b47dce2c0bd7c54997938ec4cb9f16884 +refs/heads/master: d7b01f78a3ae6a3cc21a16a1a3d377adc2227537 diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index 6462109acc70..ff7a1f358a36 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/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/trunk/arch/sh/include/asm/processor_64.h b/trunk/arch/sh/include/asm/processor_64.h index 96067e9397ea..803177fcf086 100644 --- a/trunk/arch/sh/include/asm/processor_64.h +++ b/trunk/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/trunk/arch/sh/include/asm/syscall_64.h b/trunk/arch/sh/include/asm/syscall_64.h index e95f3ae30aff..e1143b9784d6 100644 --- a/trunk/arch/sh/include/asm/syscall_64.h +++ b/trunk/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, ®s->reg[2 + i], n * sizeof(args[0])); + memcpy(args, ®s->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(®s->reg[2 + i], args, n * sizeof(args[0])); + memcpy(®s->regs[2 + i], args, n * sizeof(args[0])); } #endif /* __ASM_SH_SYSCALL_64_H */