diff --git a/[refs] b/[refs]
index b6707ac9301b..d56c2d82415c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b3a53ab76771e3669e50086c131e1574fe25847
+refs/heads/master: c9f0b1c1410e9e637b819c5050fc8c1f1971e178
diff --git a/trunk/include/asm-sh/processor.h b/trunk/include/asm-sh/processor.h
index 4a90e7cd8199..6f1dd7ca1b1d 100644
--- a/trunk/include/asm-sh/processor.h
+++ b/trunk/include/asm-sh/processor.h
@@ -259,8 +259,8 @@ void show_trace(struct task_struct *tsk, unsigned long *sp,
 		struct pt_regs *regs);
 extern unsigned long get_wchan(struct task_struct *p);
 
-#define KSTK_EIP(tsk)  ((tsk)->thread.pc)
-#define KSTK_ESP(tsk)  ((tsk)->thread.sp)
+#define KSTK_EIP(tsk)  (task_pt_regs(tsk)->pc)
+#define KSTK_ESP(tsk)  (task_pt_regs(tsk)->regs[15])
 
 #define cpu_sleep()	__asm__ __volatile__ ("sleep" : : : "memory")
 #define cpu_relax()	barrier()