From b840a2e86cb6f2222479a17f1baa558fecca244a Mon Sep 17 00:00:00 2001 From: Tkhai Kirill Date: Thu, 31 Mar 2011 00:52:38 -0700 Subject: [PATCH] --- yaml --- r: 243577 b: refs/heads/master c: 47c7c97a93a5b8f719093dbf83555090b3b8228b h: refs/heads/master i: 243575: b1b9b3e20cf6a03af3c32d301aa0d054e0897ba1 v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/entry.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 541c84e4ea70..5adac9dfdad8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cd7a63756a68ad5e718b42aa108e27c19425743 +refs/heads/master: 47c7c97a93a5b8f719093dbf83555090b3b8228b diff --git a/trunk/arch/sparc/kernel/entry.S b/trunk/arch/sparc/kernel/entry.S index 1504df8ddf70..906ee3e24cc9 100644 --- a/trunk/arch/sparc/kernel/entry.S +++ b/trunk/arch/sparc/kernel/entry.S @@ -1283,7 +1283,7 @@ linux_syscall_trace: .globl ret_from_fork ret_from_fork: call schedule_tail - mov %g3, %o0 + ld [%g3 + TI_TASK], %o0 b ret_sys_call ld [%sp + STACKFRAME_SZ + PT_I0], %o0