From 9393861a7abe5aaa71857672b4f19e166ff5d266 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 12 Jan 2006 01:05:53 -0800 Subject: [PATCH] --- yaml --- r: 18078 b: refs/heads/master c: 097cb338c72b4916d8221278caba63d74d9f19d6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/frv/kernel/process.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fa5f453a460a..840717ab66d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c3559fc458e3ed171d7a8bf6a6d7eaea1e7b2e5 +refs/heads/master: 097cb338c72b4916d8221278caba63d74d9f19d6 diff --git a/trunk/arch/frv/kernel/process.c b/trunk/arch/frv/kernel/process.c index c4488379ac3b..0fff8a61ef2a 100644 --- a/trunk/arch/frv/kernel/process.c +++ b/trunk/arch/frv/kernel/process.c @@ -204,7 +204,7 @@ int copy_thread(int nr, unsigned long clone_flags, regs0 = __kernel_frame0_ptr; childregs0 = (struct pt_regs *) - ((unsigned long) p->thread_info + THREAD_SIZE - USER_CONTEXT_SIZE); + (task_stack_page(p) + THREAD_SIZE - USER_CONTEXT_SIZE); childregs = childregs0; /* set up the userspace frame (the only place that the USP is stored) */ @@ -220,7 +220,7 @@ int copy_thread(int nr, unsigned long clone_flags, *childregs = *regs; childregs->sp = (unsigned long) childregs0; childregs->next_frame = childregs0; - childregs->gr15 = (unsigned long) p->thread_info; + childregs->gr15 = (unsigned long) task_thread_info(p); childregs->gr29 = (unsigned long) p; }