3 files changed, 5 insertions, 5 deletions

diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 7acad7055089..982d732a8705 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -276,7 +276,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 {
         extern void ret_from_fork(void);
 
-        struct thread_info *childti = p->thread_info;
+        struct thread_info *childti = task_thread_info(p);
         struct pt_regs * childregs;
         struct switch_stack * childstack, *stack;
         unsigned long stack_offset, settls;
@@ -285,7 +285,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
         if (!(regs->ps & 8))
                 stack_offset = (PAGE_SIZE-1) & (unsigned long) regs;
         childregs = (struct pt_regs *)
-          (stack_offset + PAGE_SIZE + (long) childti);
+          (stack_offset + PAGE_SIZE + task_stack_page(p));
                 
         *childregs = *regs;
         settls = regs->r20;
@@ -492,7 +492,7 @@ out:
 unsigned long
 thread_saved_pc(task_t *t)
 {
-        unsigned long base = (unsigned long)t->thread_info;
+        unsigned long base = (unsigned long)task_stack_page(t);
         unsigned long fp, sp = task_thread_info(t)->pcb.ksp;
 
         if (sp > base && sp+6*8 < base + 16*1024) {
diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c
index 961008c3d422..9069281313a3 100644
--- a/arch/alpha/kernel/ptrace.c
+++ b/arch/alpha/kernel/ptrace.c
@@ -110,7 +110,7 @@ get_reg_addr(struct task_struct * task, unsigned long regno)
                 zero = 0;
                 addr = &zero;
         } else {
-                addr = (void *)task->thread_info + regoff[regno];
+                addr = task_stack_page(task) + regoff[regno];
         }
         return addr;
 }
diff --git a/include/asm-alpha/ptrace.h b/include/asm-alpha/ptrace.h
index 072375c135b4..994680b73a87 100644
--- a/include/asm-alpha/ptrace.h
+++ b/include/asm-alpha/ptrace.h
@@ -76,7 +76,7 @@ struct switch_stack {
 extern void show_regs(struct pt_regs *);
 
 #define alpha_task_regs(task) \
-  ((struct pt_regs *) ((long) (task)->thread_info + 2*PAGE_SIZE) - 1)
+  ((struct pt_regs *) (task_stack_page(task) + 2*PAGE_SIZE) - 1)
 
 #define force_successful_syscall_return() (alpha_task_regs(current)->r0 = 0)