aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/process.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 04:05:36 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 12:08:50 -0500
commit27f451304aa6f2bccf34ef3c2b049c01d05d6fff (patch)
treef4593b303847acb33885ea2638c5ef96a82945dd /arch/alpha/kernel/process.c
parent37bfbaf995d2c1f8196ee04c9d6f68258d5ec3e8 (diff)
[PATCH] alpha: task_stack_page()
use task_stack_page() for accesses to stack page of task in alpha-specific parts of tree 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/alpha/kernel/process.c')
-rw-r--r--arch/alpha/kernel/process.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 7acad7055089..982d732a8705 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -276,7 +276,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
276{ 276{
277 extern void ret_from_fork(void); 277 extern void ret_from_fork(void);
278 278
279 struct thread_info *childti = p->thread_info; 279 struct thread_info *childti = task_thread_info(p);
280 struct pt_regs * childregs; 280 struct pt_regs * childregs;
281 struct switch_stack * childstack, *stack; 281 struct switch_stack * childstack, *stack;
282 unsigned long stack_offset, settls; 282 unsigned long stack_offset, settls;
@@ -285,7 +285,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
285 if (!(regs->ps & 8)) 285 if (!(regs->ps & 8))
286 stack_offset = (PAGE_SIZE-1) & (unsigned long) regs; 286 stack_offset = (PAGE_SIZE-1) & (unsigned long) regs;
287 childregs = (struct pt_regs *) 287 childregs = (struct pt_regs *)
288 (stack_offset + PAGE_SIZE + (long) childti); 288 (stack_offset + PAGE_SIZE + task_stack_page(p));
289 289
290 *childregs = *regs; 290 *childregs = *regs;
291 settls = regs->r20; 291 settls = regs->r20;
@@ -492,7 +492,7 @@ out:
492unsigned long 492unsigned long
493thread_saved_pc(task_t *t) 493thread_saved_pc(task_t *t)
494{ 494{
495 unsigned long base = (unsigned long)t->thread_info; 495 unsigned long base = (unsigned long)task_stack_page(t);
496 unsigned long fp, sp = task_thread_info(t)->pcb.ksp; 496 unsigned long fp, sp = task_thread_info(t)->pcb.ksp;
497 497
498 if (sp > base && sp+6*8 < base + 16*1024) { 498 if (sp > base && sp+6*8 < base + 16*1024) {