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

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

[PATCH] sh64: task_stack_page() 



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 7fdf0d7a

arch/sh64/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 
	}

#endif

	/* Copy from sh version */

	childregs = ((struct pt_regs *)(THREAD_SIZE + (unsigned long) p->thread_info )) - 1;

	childregs = (struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1;



	*childregs = *regs;
@@ -752,7 +752,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 
		childregs->regs[15] = usp;

		p->thread.uregs = childregs;

	} else {

		childregs->regs[15] = (unsigned long)p->thread_info + THREAD_SIZE;

		childregs->regs[15] = (unsigned long)task_stack_page(p) + THREAD_SIZE;

	}



	childregs->regs[9] = 0; /* Set return value for child */

arch/sh64/lib/dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ void evt_debug(int evt, int ret_addr, int event, int tra, struct pt_regs *regs) 
	struct ring_node *rr;



	pid = current->pid;

	stack_bottom = (unsigned long) current->thread_info;

	stack_bottom = (unsigned long) task_stack_page(current);

	asm volatile("ori r15, 0, %0" : "=r" (sp));

	rr = event_ring + event_ptr;

	rr->evt = evt;