From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/i386/kernel/process.c | 2 +- include/asm-i386/processor.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/i386/kernel/process.c~i386-task_stack_page arch/i386/kernel/process.c --- devel/arch/i386/kernel/process.c~i386-task_stack_page 2006-01-04 22:01:54.000000000 -0800 +++ devel-akpm/arch/i386/kernel/process.c 2006-01-04 22:01:54.000000000 -0800 @@ -771,7 +771,7 @@ unsigned long get_wchan(struct task_stru int count = 0; 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); esp = p->thread.esp; if (!stack_page || esp < stack_page || esp > top_esp+stack_page) return 0; diff -puN include/asm-i386/processor.h~i386-task_stack_page include/asm-i386/processor.h --- devel/include/asm-i386/processor.h~i386-task_stack_page 2006-01-04 22:01:54.000000000 -0800 +++ devel-akpm/include/asm-i386/processor.h 2006-01-04 22:01:54.000000000 -0800 @@ -574,7 +574,7 @@ unsigned long get_wchan(struct task_stru #define task_pt_regs(task) \ ({ \ struct pt_regs *__regs__; \ - __regs__ = (struct pt_regs *)(KSTK_TOP((task)->thread_info)-8); \ + __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \ __regs__ - 1; \ }) _