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

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

[PATCH] sh: 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 cafcfcaa

arch/sh/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 
	if (user_mode(regs)) {

		childregs->regs[15] = usp;

	} else {

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

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

	}

        if (clone_flags & CLONE_SETTLS) {

		childregs->gbr = childregs->regs[0];

include/asm-sh/ptrace.h

+2 −2
Original line number Diff line number Diff line
@@ -93,11 +93,11 @@ extern void show_regs(struct pt_regs *); 


#ifdef CONFIG_SH_DSP

#define task_pt_regs(task) \

	((struct pt_regs *) ((unsigned long)(task)->thread_info + THREAD_SIZE \

	((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE \

		 - sizeof(struct pt_dspregs) - sizeof(unsigned long)) - 1)

#else

#define task_pt_regs(task) \

	((struct pt_regs *) ((unsigned long)(task)->thread_info + THREAD_SIZE \

	((struct pt_regs *) (task_stack_page(task) + THREAD_SIZE \

		 - sizeof(unsigned long)) - 1)

#endif