[PATCH] parisc: task_stack_page(), task_thread_info()

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>

authored by Al Viro and committed by Linus Torvalds 40f1f0de 513091ba

+4 -4
+3 -3
arch/parisc/kernel/process.c
··· 295 struct task_struct * p, struct pt_regs * pregs) 296 { 297 struct pt_regs * cregs = &(p->thread.regs); 298 - struct thread_info *ti = p->thread_info; 299 300 /* We have to use void * instead of a function pointer, because 301 * function pointers aren't a pointer to the function on 64-bit. ··· 322 */ 323 if (usp == 1) { 324 /* kernel thread */ 325 - cregs->ksp = (((unsigned long)(ti)) + THREAD_SZ_ALGN); 326 /* Must exit via ret_from_kernel_thread in order 327 * to call schedule_tail() 328 */ ··· 344 */ 345 346 /* Use same stack depth as parent */ 347 - cregs->ksp = ((unsigned long)(ti)) 348 + (pregs->gr[21] & (THREAD_SIZE - 1)); 349 cregs->gr[30] = usp; 350 if (p->personality == PER_HPUX) {
··· 295 struct task_struct * p, struct pt_regs * pregs) 296 { 297 struct pt_regs * cregs = &(p->thread.regs); 298 + void *stack = task_stack_page(p); 299 300 /* We have to use void * instead of a function pointer, because 301 * function pointers aren't a pointer to the function on 64-bit. ··· 322 */ 323 if (usp == 1) { 324 /* kernel thread */ 325 + cregs->ksp = (unsigned long)stack + THREAD_SZ_ALGN; 326 /* Must exit via ret_from_kernel_thread in order 327 * to call schedule_tail() 328 */ ··· 344 */ 345 346 /* Use same stack depth as parent */ 347 + cregs->ksp = (unsigned long)stack 348 + (pregs->gr[21] & (THREAD_SIZE - 1)); 349 cregs->gr[30] = usp; 350 if (p->personality == PER_HPUX) {
+1 -1
arch/parisc/kernel/smp.c
··· 517 if (IS_ERR(idle)) 518 panic("SMP: fork failed for CPU:%d", cpuid); 519 520 - idle->thread_info->cpu = cpuid; 521 522 /* Let _start know what logical CPU we're booting 523 ** (offset into init_tasks[],cpu_data[])
··· 517 if (IS_ERR(idle)) 518 panic("SMP: fork failed for CPU:%d", cpuid); 519 520 + task_thread_info(idle)->cpu = cpuid; 521 522 /* Let _start know what logical CPU we're booting 523 ** (offset into init_tasks[],cpu_data[])