From 439bff96f2c55a1f364bd9c8a620d123dd307a0e Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 12 Jan 2006 01:05:36 -0800
Subject: [PATCH] --- yaml --- r: 18055 b: refs/heads/master c:
 27f451304aa6f2bccf34ef3c2b049c01d05d6fff h: refs/heads/master i:   18053:
 ba2264ee7aa8081c97d7dc5d96c7f9de8f2e63d5   18051:
 b08cdd15b01fc2994e0287af8c004c17bff0b69f   18047:
 0684d8530e26f8487b48a0ee41305f443d3525f1 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/alpha/kernel/process.c | 6 +++---
 trunk/arch/alpha/kernel/ptrace.c  | 2 +-
 trunk/include/asm-alpha/ptrace.h  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 692c6464bdc9..795481252453 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37bfbaf995d2c1f8196ee04c9d6f68258d5ec3e8
+refs/heads/master: 27f451304aa6f2bccf34ef3c2b049c01d05d6fff
diff --git a/trunk/arch/alpha/kernel/process.c b/trunk/arch/alpha/kernel/process.c
index 7acad7055089..982d732a8705 100644
--- a/trunk/arch/alpha/kernel/process.c
+++ b/trunk/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 @@ do_sys_execve(char __user *ufilename, char __user * __user *argv,
 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/trunk/arch/alpha/kernel/ptrace.c b/trunk/arch/alpha/kernel/ptrace.c
index 961008c3d422..9069281313a3 100644
--- a/trunk/arch/alpha/kernel/ptrace.c
+++ b/trunk/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/trunk/include/asm-alpha/ptrace.h b/trunk/include/asm-alpha/ptrace.h
index 072375c135b4..994680b73a87 100644
--- a/trunk/include/asm-alpha/ptrace.h
+++ b/trunk/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)