From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/parisc/kernel/process.c | 6 +++--- arch/parisc/kernel/smp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/parisc/kernel/process.c~parisc-task_stack_page-task_thread_info arch/parisc/kernel/process.c --- devel/arch/parisc/kernel/process.c~parisc-task_stack_page-task_thread_info 2006-01-04 22:02:32.000000000 -0800 +++ devel-akpm/arch/parisc/kernel/process.c 2006-01-04 22:02:32.000000000 -0800 @@ -295,7 +295,7 @@ copy_thread(int nr, unsigned long clone_ struct task_struct * p, struct pt_regs * pregs) { struct pt_regs * cregs = &(p->thread.regs); - struct thread_info *ti = p->thread_info; + void *stack = task_stack_page(p); /* We have to use void * instead of a function pointer, because * function pointers aren't a pointer to the function on 64-bit. @@ -322,7 +322,7 @@ copy_thread(int nr, unsigned long clone_ */ if (usp == 1) { /* kernel thread */ - cregs->ksp = (((unsigned long)(ti)) + THREAD_SZ_ALGN); + cregs->ksp = (unsigned long)stack + THREAD_SZ_ALGN; /* Must exit via ret_from_kernel_thread in order * to call schedule_tail() */ @@ -344,7 +344,7 @@ copy_thread(int nr, unsigned long clone_ */ /* Use same stack depth as parent */ - cregs->ksp = ((unsigned long)(ti)) + cregs->ksp = (unsigned long)stack + (pregs->gr[21] & (THREAD_SIZE - 1)); cregs->gr[30] = usp; if (p->personality == PER_HPUX) { diff -puN arch/parisc/kernel/smp.c~parisc-task_stack_page-task_thread_info arch/parisc/kernel/smp.c --- devel/arch/parisc/kernel/smp.c~parisc-task_stack_page-task_thread_info 2006-01-04 22:02:32.000000000 -0800 +++ devel-akpm/arch/parisc/kernel/smp.c 2006-01-04 22:02:32.000000000 -0800 @@ -519,7 +519,7 @@ int __init smp_boot_one_cpu(int cpuid) if (IS_ERR(idle)) panic("SMP: fork failed for CPU:%d", cpuid); - idle->thread_info->cpu = cpuid; + task_thread_info(idle)->cpu = cpuid; /* Let _start know what logical CPU we're booting ** (offset into init_tasks[],cpu_data[]) _