diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:05:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:08:52 -0500 |
commit | 65e0fdffc977e69a8f1f26d4bf8ba30984db7e44 (patch) | |
tree | 569c7238ea64dfac7508c503d4f0229a72d06e32 | |
parent | 07b047fc2466249aff7cdb23fa0b0955a7a00d48 (diff) |
[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.c | 2 | ||||
-rw-r--r-- | include/asm-i386/processor.h | 2 |
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) | |||
771 | int count = 0; | 771 | int count = 0; |
772 | if (!p || p == current || p->state == TASK_RUNNING) | 772 | if (!p || p == current || p->state == TASK_RUNNING) |
773 | return 0; | 773 | return 0; |
774 | stack_page = (unsigned long)p->thread_info; | 774 | stack_page = (unsigned long)task_stack_page(p); |
775 | esp = p->thread.esp; | 775 | esp = p->thread.esp; |
776 | if (!stack_page || esp < stack_page || esp > top_esp+stack_page) | 776 | if (!stack_page || esp < stack_page || esp > top_esp+stack_page) |
777 | return 0; | 777 | 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); | |||
574 | #define task_pt_regs(task) \ | 574 | #define task_pt_regs(task) \ |
575 | ({ \ | 575 | ({ \ |
576 | struct pt_regs *__regs__; \ | 576 | struct pt_regs *__regs__; \ |
577 | __regs__ = (struct pt_regs *)(KSTK_TOP((task)->thread_info)-8); \ | 577 | __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \ |
578 | __regs__ - 1; \ | 578 | __regs__ - 1; \ |
579 | }) | 579 | }) |
580 | 580 | ||