From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/arm/kernel/process.c | 2 +- arch/arm/kernel/smp.c | 4 ++-- arch/arm/kernel/traps.c | 2 +- include/asm-arm/processor.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff -puN arch/arm/kernel/process.c~arm-task_stack_page arch/arm/kernel/process.c --- devel/arch/arm/kernel/process.c~arm-task_stack_page 2006-01-04 22:02:42.000000000 -0800 +++ devel-akpm/arch/arm/kernel/process.c 2006-01-04 22:02:42.000000000 -0800 @@ -460,7 +460,7 @@ unsigned long get_wchan(struct task_stru 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 -puN arch/arm/kernel/smp.c~arm-task_stack_page arch/arm/kernel/smp.c --- devel/arch/arm/kernel/smp.c~arm-task_stack_page 2006-01-04 22:02:42.000000000 -0800 +++ devel-akpm/arch/arm/kernel/smp.c 2006-01-04 22:02:42.000000000 -0800 @@ -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 -puN arch/arm/kernel/traps.c~arm-task_stack_page arch/arm/kernel/traps.c --- devel/arch/arm/kernel/traps.c~arm-task_stack_page 2006-01-04 22:02:42.000000000 -0800 +++ devel-akpm/arch/arm/kernel/traps.c 2006-01-04 22:02:42.000000000 -0800 @@ -210,7 +210,7 @@ static void __die(const char *str, int e 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 -puN include/asm-arm/processor.h~arm-task_stack_page include/asm-arm/processor.h --- devel/include/asm-arm/processor.h~arm-task_stack_page 2006-01-04 22:02:42.000000000 -0800 +++ devel-akpm/include/asm-arm/processor.h 2006-01-04 22:02:42.000000000 -0800 @@ -86,7 +86,7 @@ unsigned long get_wchan(struct task_stru 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 _