1 files changed, 12 insertions, 12 deletions

diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 8d88eeea02d1..eaed14aac6aa 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -254,7 +254,7 @@ get_rnat (struct task_struct *task, struct switch_stack *sw,
         long num_regs, nbits;
         struct pt_regs *pt;
 
-        pt = ia64_task_regs(task);
+        pt = task_pt_regs(task);
         kbsp = (unsigned long *) sw->ar_bspstore;
         ubspstore = (unsigned long *) pt->ar_bspstore;
 
@@ -314,7 +314,7 @@ put_rnat (struct task_struct *task, struct switch_stack *sw,
         struct pt_regs *pt;
         unsigned long cfm, *urbs_kargs;
 
-        pt = ia64_task_regs(task);
+        pt = task_pt_regs(task);
         kbsp = (unsigned long *) sw->ar_bspstore;
         ubspstore = (unsigned long *) pt->ar_bspstore;
 
@@ -407,7 +407,7 @@ ia64_peek (struct task_struct *child, struct switch_stack *child_stack,
 
         urbs_end = (long *) user_rbs_end;
         laddr = (unsigned long *) addr;
-        child_regs = ia64_task_regs(child);
+        child_regs = task_pt_regs(child);
         bspstore = (unsigned long *) child_regs->ar_bspstore;
         krbs = (unsigned long *) child + IA64_RBS_OFFSET/8;
         if (on_kernel_rbs(addr, (unsigned long) bspstore,
@@ -467,7 +467,7 @@ ia64_poke (struct task_struct *child, struct switch_stack *child_stack,
         struct pt_regs *child_regs;
 
         laddr = (unsigned long *) addr;
-        child_regs = ia64_task_regs(child);
+        child_regs = task_pt_regs(child);
         bspstore = (unsigned long *) child_regs->ar_bspstore;
         krbs = (unsigned long *) child + IA64_RBS_OFFSET/8;
         if (on_kernel_rbs(addr, (unsigned long) bspstore,
@@ -567,7 +567,7 @@ thread_matches (struct task_struct *thread, unsigned long addr)
                  */
                 return 0;
 
-        thread_regs = ia64_task_regs(thread);
+        thread_regs = task_pt_regs(thread);
         thread_rbs_end = ia64_get_user_rbs_end(thread, thread_regs, NULL);
         if (!on_kernel_rbs(addr, thread_regs->ar_bspstore, thread_rbs_end))
                 return 0;
@@ -627,7 +627,7 @@ find_thread_for_addr (struct task_struct *child, unsigned long addr)
 inline void
 ia64_flush_fph (struct task_struct *task)
 {
-        struct ia64_psr *psr = ia64_psr(ia64_task_regs(task));
+        struct ia64_psr *psr = ia64_psr(task_pt_regs(task));
 
         /*
          * Prevent migrating this task while
@@ -653,7 +653,7 @@ ia64_flush_fph (struct task_struct *task)
 void
 ia64_sync_fph (struct task_struct *task)
 {
-        struct ia64_psr *psr = ia64_psr(ia64_task_regs(task));
+        struct ia64_psr *psr = ia64_psr(task_pt_regs(task));
 
         ia64_flush_fph(task);
         if (!(task->thread.flags & IA64_THREAD_FPH_VALID)) {
@@ -794,7 +794,7 @@ access_uarea (struct task_struct *child, unsigned long addr,
                                           + offsetof(struct pt_regs, reg)))
 
 
-        pt = ia64_task_regs(child);
+        pt = task_pt_regs(child);
         sw = (struct switch_stack *) (child->thread.ksp + 16);
 
         if ((addr & 0x7) != 0) {
@@ -1120,7 +1120,7 @@ ptrace_getregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
         if (!access_ok(VERIFY_WRITE, ppr, sizeof(struct pt_all_user_regs)))
                 return -EIO;
 
-        pt = ia64_task_regs(child);
+        pt = task_pt_regs(child);
         sw = (struct switch_stack *) (child->thread.ksp + 16);
         unw_init_from_blocked_task(&info, child);
         if (unw_unwind_to_user(&info) < 0) {
@@ -1265,7 +1265,7 @@ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
         if (!access_ok(VERIFY_READ, ppr, sizeof(struct pt_all_user_regs)))
                 return -EIO;
 
-        pt = ia64_task_regs(child);
+        pt = task_pt_regs(child);
         sw = (struct switch_stack *) (child->thread.ksp + 16);
         unw_init_from_blocked_task(&info, child);
         if (unw_unwind_to_user(&info) < 0) {
@@ -1403,7 +1403,7 @@ ptrace_setregs (struct task_struct *child, struct pt_all_user_regs __user *ppr)
 void
 ptrace_disable (struct task_struct *child)
 {
-        struct ia64_psr *child_psr = ia64_psr(ia64_task_regs(child));
+        struct ia64_psr *child_psr = ia64_psr(task_pt_regs(child));
 
         /* make sure the single step/taken-branch trap bits are not set: */
         child_psr->ss = 0;
@@ -1456,7 +1456,7 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
         if (ret < 0)
                 goto out_tsk;
 
-        pt = ia64_task_regs(child);
+        pt = task_pt_regs(child);
         sw = (struct switch_stack *) (child->thread.ksp + 16);
 
         switch (request) {