diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-01 08:54:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-01 08:54:14 -0700 |
| commit | afdef69c7ff7d0bf59e3cafc187aefb12878dbe3 (patch) | |
| tree | 6b8e341c9a25b3e66d6e8027a03c76afd6508d0d /arch/sparc/kernel/entry.S | |
| parent | 84daeb09ef2b11cb0b29e100766e38e206c8bc47 (diff) | |
| parent | 47c7c97a93a5b8f719093dbf83555090b3b8228b (diff) | |
| download | op-kernel-dev-afdef69c7ff7d0bf59e3cafc187aefb12878dbe3.zip op-kernel-dev-afdef69c7ff7d0bf59e3cafc187aefb12878dbe3.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32: Pass task_struct to schedule_tail() in ret_from_fork
apbuart: Depend upon sparc.
sparc64: Fix section mis-match errors.
sparc32,leon: Fixed APBUART frequency detection
sparc32, leon: APBUART driver must use archdata to get IRQ number
sparc: Hook up syncfs system call.
Diffstat (limited to 'arch/sparc/kernel/entry.S')
| -rw-r--r-- | arch/sparc/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index 1504df8..906ee3e 100644 --- a/arch/sparc/kernel/entry.S +++ b/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 |
