[PATCH] sh: task_pt_regs()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 8 insertions, 48 deletions

diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 8a2bea34ddd2..8c0060ce6c02 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -191,13 +191,8 @@ void flush_thread(void)
 {
 #if defined(CONFIG_SH_FPU)
         struct task_struct *tsk = current;
-        struct pt_regs *regs = (struct pt_regs *)
-                                ((unsigned long)tsk->thread_info
-                                 + THREAD_SIZE - sizeof(struct pt_regs)
-                                 - sizeof(unsigned long));
-
         /* Forget lazy FPU state */
-        clear_fpu(tsk, regs);
+        clear_fpu(tsk, task_pt_regs(tsk));
         clear_used_math();
 #endif
 }
@@ -232,13 +227,7 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
 {
         struct pt_regs ptregs;
         
-        ptregs = *(struct pt_regs *)
-                ((unsigned long)tsk->thread_info + THREAD_SIZE
-                 - sizeof(struct pt_regs)
-#ifdef CONFIG_SH_DSP
-                 - sizeof(struct pt_dspregs)
-#endif
-                 - sizeof(unsigned long));
+        ptregs = *task_pt_regs(tsk);
         elf_core_copy_regs(regs, &ptregs);
 
         return 1;
@@ -252,11 +241,7 @@ dump_task_fpu (struct task_struct *tsk, elf_fpregset_t *fpu)
 #if defined(CONFIG_SH_FPU)
         fpvalid = !!tsk_used_math(tsk);
         if (fpvalid) {
-                struct pt_regs *regs = (struct pt_regs *)
-                                        ((unsigned long)tsk->thread_info
-                                         + THREAD_SIZE - sizeof(struct pt_regs)
-                                         - sizeof(unsigned long));
-                unlazy_fpu(tsk, regs);
+                unlazy_fpu(tsk, task_pt_regs(tsk));
                 memcpy(fpu, &tsk->thread.fpu.hard, sizeof(*fpu));
         }
 #endif
@@ -279,12 +264,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
         copy_to_stopped_child_used_math(p);
 #endif
 
-        childregs = ((struct pt_regs *)
-                (THREAD_SIZE + (unsigned long) p->thread_info)
-#ifdef CONFIG_SH_DSP
-                - sizeof(struct pt_dspregs)
-#endif
-                - sizeof(unsigned long)) - 1;
+        childregs = task_pt_regs(p);
         *childregs = *regs;
 
         if (user_mode(regs)) {
@@ -333,11 +313,7 @@ ubc_set_tracing(int asid, unsigned long pc)
 struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *next)
 {
 #if defined(CONFIG_SH_FPU)
-        struct pt_regs *regs = (struct pt_regs *)
-                                ((unsigned long)prev->thread_info
-                                 + THREAD_SIZE - sizeof(struct pt_regs)
-                                 - sizeof(unsigned long));
-        unlazy_fpu(prev, regs);
+        unlazy_fpu(prev, task_pt_regs(prev));
 #endif
 
 #ifdef CONFIG_PREEMPT
@@ -346,13 +322,7 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
                 struct pt_regs *regs;
 
                 local_irq_save(flags);
-                regs = (struct pt_regs *)
-                        ((unsigned long)prev->thread_info
-                         + THREAD_SIZE - sizeof(struct pt_regs)
-#ifdef CONFIG_SH_DSP
-                         - sizeof(struct pt_dspregs)
-#endif
-                         - sizeof(unsigned long));
+                regs = task_pt_regs(prev);
                 if (user_mode(regs) && regs->regs[15] >= 0xc0000000) {
                         int offset = (int)regs->regs[15];
 
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c
index 1a8be06519ec..3887b4f6feb2 100644
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace.c
@@ -41,12 +41,7 @@ static inline int get_stack_long(struct task_struct *task, int offset)
 {
         unsigned char *stack;
 
-        stack = (unsigned char *)
-                task->thread_info + THREAD_SIZE - sizeof(struct pt_regs)
-#ifdef CONFIG_SH_DSP
-                - sizeof(struct pt_dspregs)
-#endif
-                - sizeof(unsigned long);
+        stack = (unsigned char *)task_pt_regs(task);
         stack += offset;
         return (*((int *)stack));
 }
@@ -59,12 +54,7 @@ static inline int put_stack_long(struct task_struct *task, int offset,
 {
         unsigned char *stack;
 
-        stack = (unsigned char *)
-                task->thread_info + THREAD_SIZE - sizeof(struct pt_regs)
-#ifdef CONFIG_SH_DSP
-                - sizeof(struct pt_dspregs)
-#endif
-                - sizeof(unsigned long);
+        stack = (unsigned char *)task_pt_regs(task);
         stack += offset;
         *(unsigned long *) stack = data;
         return 0;