2 files changed, 3 insertions, 3 deletions

diff --git a/arch/sh64/kernel/process.c b/arch/sh64/kernel/process.c
index 419b5a71044..1da9c61d682 100644
--- a/arch/sh64/kernel/process.c
+++ b/arch/sh64/kernel/process.c
@@ -744,7 +744,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
         }
 #endif
         /* Copy from sh version */
-        childregs = ((struct pt_regs *)(THREAD_SIZE + (unsigned long) p->thread_info )) - 1;
+        childregs = (struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1;
 
         *childregs = *regs;
 
@@ -752,7 +752,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
                 childregs->regs[15] = usp;
                 p->thread.uregs = childregs;
         } else {
-                childregs->regs[15] = (unsigned long)p->thread_info + THREAD_SIZE;
+                childregs->regs[15] = (unsigned long)task_stack_page(p) + THREAD_SIZE;
         }
 
         childregs->regs[9] = 0; /* Set return value for child */
diff --git a/arch/sh64/lib/dbg.c b/arch/sh64/lib/dbg.c
index 526fedae6db..58087331b8a 100644
--- a/arch/sh64/lib/dbg.c
+++ b/arch/sh64/lib/dbg.c
@@ -174,7 +174,7 @@ void evt_debug(int evt, int ret_addr, int event, int tra, struct pt_regs *regs)
         struct ring_node *rr;
 
         pid = current->pid;
-        stack_bottom = (unsigned long) current->thread_info;
+        stack_bottom = (unsigned long) task_stack_page(current);
         asm volatile("ori r15, 0, %0" : "=r" (sp));
         rr = event_ring + event_ptr;
         rr->evt = evt;