[PATCH] arm: 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>

4 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index ac6ed955ca0f..4b4e4cf79c80 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -460,7 +460,7 @@ unsigned long get_wchan(struct task_struct *p)
                 return 0;
 
         stack_start = (unsigned long)end_of_stack(p);
-        stack_end = ((unsigned long)p->thread_info) + THREAD_SIZE;
+        stack_end = (unsigned long)task_stack_page(p) + THREAD_SIZE;
 
         fp = thread_saved_fp(p);
         do {
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 373c0959bc2f..7338948bd7d3 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -114,7 +114,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
          * We need to tell the secondary core where to find
          * its stack and the page tables.
          */
-        secondary_data.stack = (void *)idle->thread_info + THREAD_START_SP;
+        secondary_data.stack = task_stack_page(idle) + THREAD_START_SP;
         secondary_data.pgdir = virt_to_phys(pgd);
         wmb();
 
@@ -245,7 +245,7 @@ void __cpuexit cpu_die(void)
         __asm__("mov    sp, %0\n"
         "       b       secondary_start_kernel"
                 :
-                : "r" ((void *)current->thread_info + THREAD_SIZE - 8));
+                : "r" (task_stack_page(current) + THREAD_SIZE - 8));
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index c1a04ec830d1..93cfd3ffcc72 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -210,7 +210,7 @@ static void __die(const char *str, int err, struct thread_info *thread, struct p
 
         if (!user_mode(regs) || in_interrupt()) {
                 dump_mem("Stack: ", regs->ARM_sp,
-                         THREAD_SIZE + (unsigned long)tsk->thread_info);
+                         THREAD_SIZE + (unsigned long)task_stack_page(tsk));
                 dump_backtrace(regs, tsk);
                 dump_instr(regs);
         }
diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h
index fb5877e5a39b..31290694648b 100644
--- a/include/asm-arm/processor.h
+++ b/include/asm-arm/processor.h
@@ -86,7 +86,7 @@ unsigned long get_wchan(struct task_struct *p);
 extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
 
 #define task_pt_regs(p) \
-        ((struct pt_regs *)(THREAD_START_SP + (void *)(p)->thread_info) - 1)
+        ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)
 
 #define KSTK_EIP(tsk)   task_pt_regs(tsk)->ARM_pc
 #define KSTK_ESP(tsk)   task_pt_regs(tsk)->ARM_sp