From e01e3320b5d4a06f37a6c178b67c88a9d6e62674 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 12 Jan 2006 01:05:53 -0800 Subject: [PATCH] --- yaml --- r: 18079 b: refs/heads/master c: 768595ffba46b101ad54d8775e640fecbe470d9a h: refs/heads/master i: 18077: d63d8e9c32eea85f09daae8e9a84c50464e388da 18075: 36a2a6bd4e46bfbf6384b1ad6831b519676e66ad 18071: b5c5b708476c6ed56e074b43ec6bf61b5db8d5a5 18063: 5249f159c93a655f694953721819d9e44eadab86 18047: 0684d8530e26f8487b48a0ee41305f443d3525f1 v: v3 --- [refs] | 2 +- trunk/arch/m68k/kernel/process.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 840717ab66d1..7e584e86dfc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 097cb338c72b4916d8221278caba63d74d9f19d6 +refs/heads/master: 768595ffba46b101ad54d8775e640fecbe470d9a diff --git a/trunk/arch/m68k/kernel/process.c b/trunk/arch/m68k/kernel/process.c index 13d109328a42..3f9cb55d0356 100644 --- a/trunk/arch/m68k/kernel/process.c +++ b/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) ||