From 6d9416566f4beb652a26cab6ac1699248ffac910 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 12 Jan 2006 01:05:41 -0800 Subject: [PATCH] --- yaml --- r: 18062 b: refs/heads/master c: 65e0fdffc977e69a8f1f26d4bf8ba30984db7e44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/process.c | 2 +- trunk/include/asm-i386/processor.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 30d7e66e8bf9..9efc7afa9bc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07b047fc2466249aff7cdb23fa0b0955a7a00d48 +refs/heads/master: 65e0fdffc977e69a8f1f26d4bf8ba30984db7e44 diff --git a/trunk/arch/i386/kernel/process.c b/trunk/arch/i386/kernel/process.c index 3d7e0c8e9925..2185377fdde1 100644 --- a/trunk/arch/i386/kernel/process.c +++ b/trunk/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/trunk/include/asm-i386/processor.h b/trunk/include/asm-i386/processor.h index 29ad87e9123f..feca5d961e2b 100644 --- a/trunk/include/asm-i386/processor.h +++ b/trunk/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; \ })