aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 04:06:02 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 12:08:57 -0500
commit0cec6fd1370807f98934e84c9e6147335b81d8a5 (patch)
treeead813727b785ec973ef88158895cca381a25027 /arch/ppc/kernel
parentb5e2fc1c6259e6f26bc4ae4de697da1f8da0edec (diff)
[PATCH] powerpc: 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>
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r--arch/ppc/kernel/process.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/kernel/process.c b/arch/ppc/kernel/process.c
index c3555a8f2c8d..a76b504299ca 100644
--- a/arch/ppc/kernel/process.c
+++ b/arch/ppc/kernel/process.c
@@ -482,7 +482,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
482{ 482{
483 struct pt_regs *childregs, *kregs; 483 struct pt_regs *childregs, *kregs;
484 extern void ret_from_fork(void); 484 extern void ret_from_fork(void);
485 unsigned long sp = (unsigned long)p->thread_info + THREAD_SIZE; 485 unsigned long sp = (unsigned long)task_stack_page(p) + THREAD_SIZE;
486 unsigned long childframe; 486 unsigned long childframe;
487 487
488 CHECK_FULL_REGS(regs); 488 CHECK_FULL_REGS(regs);
@@ -702,8 +702,8 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
702 sp = tsk->thread.ksp; 702 sp = tsk->thread.ksp;
703 } 703 }
704 704
705 prev_sp = (unsigned long) (tsk->thread_info + 1); 705 prev_sp = (unsigned long) end_of_stack(tsk);
706 stack_top = (unsigned long) tsk->thread_info + THREAD_SIZE; 706 stack_top = (unsigned long) task_stack_page(tsk) + THREAD_SIZE;
707 while (count < 16 && sp > prev_sp && sp < stack_top && (sp & 3) == 0) { 707 while (count < 16 && sp > prev_sp && sp < stack_top && (sp & 3) == 0) {
708 if (count == 0) { 708 if (count == 0) {
709 printk("Call trace:"); 709 printk("Call trace:");
@@ -832,7 +832,7 @@ void __init ll_puts(const char *s)
832unsigned long get_wchan(struct task_struct *p) 832unsigned long get_wchan(struct task_struct *p)
833{ 833{
834 unsigned long ip, sp; 834 unsigned long ip, sp;
835 unsigned long stack_page = (unsigned long) p->thread_info; 835 unsigned long stack_page = (unsigned long) task_stack_page(p);
836 int count = 0; 836 int count = 0;
837 if (!p || p == current || p->state == TASK_RUNNING) 837 if (!p || p == current || p->state == TASK_RUNNING)
838 return 0; 838 return 0;