---

yaml
---
r: 18079
b: refs/heads/master
c: 768595f
h: refs/heads/master
i:
  18077: d63d8e9
  18075: 36a2a6b
  18071: b5c5b70
  18063: 5249f15
  18047: 0684d85
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 097cb338c72b4916d8221278caba63d74d9f19d6
+refs/heads/master: 768595ffba46b101ad54d8775e640fecbe470d9a

trunk/arch/m68k/kernel/process.c

@@ -238,10 +238,9 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 {
 	struct pt_regs * childregs;
 	struct switch_stack * childstack, *stack;
-	unsigned long stack_offset, *retp;
+	unsigned long *retp;
 
-	stack_offset = THREAD_SIZE - sizeof(struct pt_regs);
-	childregs = (struct pt_regs *) ((unsigned long) (p->thread_info) + stack_offset);
+	childregs = (struct pt_regs *) (task_stack_page(p) + THREAD_SIZE) - 1;
 
 	*childregs = *regs;
 	childregs->d0 = 0;
@@ -386,7 +385,7 @@ unsigned long get_wchan(struct task_struct *p)
 	if (!p || p == current || p->state == TASK_RUNNING)
 		return 0;
 
-	stack_page = (unsigned long)(p->thread_info);
+	stack_page = (unsigned long)task_stack_page(p);
 	fp = ((struct switch_stack *)p->thread.ksp)->a6;
 	do {
 		if (fp < stack_page+sizeof(struct thread_info) ||