diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-18 13:10:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-18 13:10:36 -0700 |
| commit | 547af560ddbfe469ada2cad3009cbcfde313d73c (patch) | |
| tree | 1f97e215de2d88d90ed34db24212dab69eb300b2 /arch/mips/kernel/scall64-64.S | |
| parent | b0579fc089808b68c53a6a95d043db034468116c (diff) | |
| parent | a35bee8a2748abe9a40865f477aba0a9b85965fd (diff) | |
| download | kernel_samsung_smdk4412-547af560ddbfe469ada2cad3009cbcfde313d73c.zip kernel_samsung_smdk4412-547af560ddbfe469ada2cad3009cbcfde313d73c.tar.gz kernel_samsung_smdk4412-547af560ddbfe469ada2cad3009cbcfde313d73c.tar.bz2 | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: Enable ISA_DMA_API config to fix build failure
MIPS: 32-bit: Fix build failure in asm/fcntl.h
MIPS: Remove all generated vmlinuz* files on "make clean"
MIPS: do_sigaltstack() expects userland pointers
MIPS: Fix error values in case of bad_stack
MIPS: Sanitize restart logics
MIPS: secure_computing, syscall audit: syscall number should in r2, not r0.
MIPS: Don't block signals if we'd failed to setup a sigframe
Diffstat (limited to 'arch/mips/kernel/scall64-64.S')
| -rw-r--r-- | arch/mips/kernel/scall64-64.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 5573f8e..3f41792 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S @@ -66,9 +66,9 @@ NESTED(handle_sys64, PT_SIZE, sp) sd t0, PT_R7(sp) # set error flag beqz t0, 1f + ld t1, PT_R2(sp) # syscall number dnegu v0 # error - sd v0, PT_R0(sp) # set flag for syscall - # restarting + sd t1, PT_R0(sp) # save it for syscall restarting 1: sd v0, PT_R2(sp) # result n64_syscall_exit: @@ -109,8 +109,9 @@ syscall_trace_entry: sd t0, PT_R7(sp) # set error flag beqz t0, 1f + ld t1, PT_R2(sp) # syscall number dnegu v0 # error - sd v0, PT_R0(sp) # set flag for syscall restarting + sd t1, PT_R0(sp) # save it for syscall restarting 1: sd v0, PT_R2(sp) # result j syscall_exit |