summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 01:05:41 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 09:08:52 -0800
commit65e0fdffc977e69a8f1f26d4bf8ba30984db7e44 (patch)
tree569c7238ea64dfac7508c503d4f0229a72d06e32
parent07b047fc2466249aff7cdb23fa0b0955a7a00d48 (diff)
downloadblackbird-op-linux-65e0fdffc977e69a8f1f26d4bf8ba30984db7e44.tar.gz
blackbird-op-linux-65e0fdffc977e69a8f1f26d4bf8ba30984db7e44.zip
[PATCH] i386: 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>
-rw-r--r--arch/i386/kernel/process.c2
-rw-r--r--include/asm-i386/processor.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 3d7e0c8e9925..2185377fdde1 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 29ad87e9123f..feca5d961e2b 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; \
})
OpenPOWER on IntegriCloud