[PATCH] m68k: task_stack_page()

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>

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 13d109328a42..3f9cb55d0356 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -238,10 +238,9 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 {
         struct pt_regs * childregs;
         struct switch_stack * childstack, *stack;
-        unsigned long stack_offset, *retp;
+        unsigned long *retp;
 
-        stack_offset = THREAD_SIZE - sizeof(struct pt_regs);
-        childregs = (struct pt_regs *) ((unsigned long) (p->thread_info) + stack_offset);
+        childregs = (struct pt_regs *) (task_stack_page(p) + THREAD_SIZE) - 1;
 
         *childregs = *regs;
         childregs->d0 = 0;
@@ -386,7 +385,7 @@ unsigned long get_wchan(struct task_struct *p)
         if (!p || p == current || p->state == TASK_RUNNING)
                 return 0;
 
-        stack_page = (unsigned long)(p->thread_info);
+        stack_page = (unsigned long)task_stack_page(p);
         fp = ((struct switch_stack *)p->thread.ksp)->a6;
         do {
                 if (fp < stack_page+sizeof(struct thread_info) ||