1 files changed, 2 insertions, 2 deletions

diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index 6a44b54ae817..f1f596644bfc 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -145,7 +145,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
         int user_mode = user_mode(regs);
 
         /* Set up new TSS. */
-        tos = (unsigned long)p->thread_info + THREAD_SIZE;
+        tos = (unsigned long)task_stack_page(p) + THREAD_SIZE;
         if (user_mode)
                 childregs = (struct pt_regs*)(tos - PT_USER_SIZE);
         else
@@ -217,7 +217,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
 unsigned long get_wchan(struct task_struct *p)
 {
         unsigned long sp, pc;
-        unsigned long stack_page = (unsigned long) p->thread_info;
+        unsigned long stack_page = (unsigned long) task_stack_page(p);
         int count = 0;
 
         if (!p || p == current || p->state == TASK_RUNNING)