---

yaml --- r: 18068 b: refs/heads/master c: 308a792 h: refs/heads/master v: v3
git-mirror · Jan 12, 2006 · f945e63 · f945e63
1 parent 268eb58
commit f945e63
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cafcfcaa60dbb5bcccbbc1d0ad7d4bdeeb4d0cc8
+refs/heads/master: 308a792f7c563a7af6e325274c63812f98988d6f
diff --git a/trunk/arch/sh/kernel/process.c b/trunk/arch/sh/kernel/process.c
@@ -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];

diff --git a/trunk/include/asm-sh/ptrace.h b/trunk/include/asm-sh/ptrace.h
@@ -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