Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40f1f0de authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 513091ba

arch/parisc/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 
	    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_flags, unsigned long usp, 
	 */

	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_flags, unsigned long usp, 
		 */



		/* 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) {

arch/parisc/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,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[])