[PATCH] cris: 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, 4 insertions, 4 deletions

diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c
index 69e28b4057e8..0a675ce9e099 100644
--- a/arch/cris/arch-v10/kernel/process.c
+++ b/arch/cris/arch-v10/kernel/process.c
@@ -79,7 +79,7 @@ void hard_reset_now (void)
  */
 unsigned long thread_saved_pc(struct task_struct *t)
 {
-        return (unsigned long)user_regs(t->thread_info)->irp;
+        return task_pt_regs(t)->irp;
 }
 
 static void kernel_thread_helper(void* dummy, int (*fn)(void *), void * arg)
@@ -128,7 +128,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
          * remember that the task_struct doubles as the kernel stack for the task
          */
 
-        childregs = user_regs(p->thread_info);        
+        childregs = task_pt_regs(p);
         
         *childregs = *regs;  /* struct copy of pt_regs */
         
diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c
index 6cbd34a27b90..f214f74f264e 100644
--- a/arch/cris/arch-v10/kernel/ptrace.c
+++ b/arch/cris/arch-v10/kernel/ptrace.c
@@ -37,7 +37,7 @@ inline long get_reg(struct task_struct *task, unsigned int regno)
         if (regno == PT_USP)
                 return task->thread.usp;
         else if (regno < PT_MAX)
-                return ((unsigned long *)user_regs(task->thread_info))[regno];
+                return ((unsigned long *)task_pt_regs(task))[regno];
         else
                 return 0;
 }
@@ -51,7 +51,7 @@ inline int put_reg(struct task_struct *task, unsigned int regno,
         if (regno == PT_USP)
                 task->thread.usp = data;
         else if (regno < PT_MAX)
-                ((unsigned long *)user_regs(task->thread_info))[regno] = data;
+                ((unsigned long *)task_pt_regs(task))[regno] = data;
         else
                 return -1;
         return 0;