---

yaml --- r: 18062 b: refs/heads/master c: 65e0fdf h: refs/heads/master v: v3
git-mirror · Jan 12, 2006 · 6d94165 · 6d94165
1 parent 017b70b
commit 6d94165
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;                                                   \
 })