From: Al Viro Date: Thu, 12 Jan 2006 09:05:41 +0000 (-0800) Subject: [PATCH] i386: task_stack_page() X-Git-Tag: v2.6.16-rc1~264 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=65e0fdffc977e69a8f1f26d4bf8ba30984db7e44;p=linux-2.6-omap-h63xx.git [PATCH] i386: task_stack_page() Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c index 3d7e0c8e992..2185377fdde 100644 --- a/arch/i386/kernel/process.c +++ b/arch/i386/kernel/process.c @@ -771,7 +771,7 @@ unsigned long get_wchan(struct task_struct *p) 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 --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h index 29ad87e9123..feca5d961e2 100644 --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h @@ -574,7 +574,7 @@ unsigned long get_wchan(struct task_struct *p); #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; \ })