aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32/kernel/process.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 04:06:03 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 12:08:58 -0500
commit95ca0dc603ab58f3e4c5a1c23f675bd1f5b5fef3 (patch)
tree367ddcc3858b9c3e852ea2f6bafaffd43424c9e5 /arch/cris/arch-v32/kernel/process.c
parent0cec6fd1370807f98934e84c9e6147335b81d8a5 (diff)
[PATCH] cris: task_pt_regs()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/cris/arch-v32/kernel/process.c')
-rw-r--r--arch/cris/arch-v32/kernel/process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 882be42114f..e88b13b139d 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -96,7 +96,7 @@ hard_reset_now(void)
96 */ 96 */
97unsigned long thread_saved_pc(struct task_struct *t) 97unsigned long thread_saved_pc(struct task_struct *t)
98{ 98{
99 return (unsigned long)user_regs(t->thread_info)->erp; 99 return task_pt_regs(t)->erp;
100} 100}
101 101
102static void 102static void
@@ -148,7 +148,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
148 * fix it up. Note: the task_struct doubles as the kernel stack for the 148 * fix it up. Note: the task_struct doubles as the kernel stack for the
149 * task. 149 * task.
150 */ 150 */
151 childregs = user_regs(p->thread_info); 151 childregs = task_pt_regs(p);
152 *childregs = *regs; /* Struct copy of pt_regs. */ 152 *childregs = *regs; /* Struct copy of pt_regs. */
153 p->set_child_tid = p->clear_child_tid = NULL; 153 p->set_child_tid = p->clear_child_tid = NULL;
154 childregs->r10 = 0; /* Child returns 0 after a fork/clone. */ 154 childregs->r10 = 0; /* Child returns 0 after a fork/clone. */