diff options
| author | Dave Jones <davej@redhat.com> | 2005-12-06 22:14:09 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-12-06 22:14:09 -0500 |
| commit | fc457fa7c0cdbfe96812ba377e508880d600298f (patch) | |
| tree | 514049d61cf8b1587141a375ba3ec4f71e09a9db /arch/mips/kernel/scall64-o32.S | |
| parent | cc6e8de8f0fab61760bb7091fb19eef1406e17be (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge ../linus/
Diffstat (limited to 'arch/mips/kernel/scall64-o32.S')
| -rw-r--r-- | arch/mips/kernel/scall64-o32.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 5a16401e443a..3d338ca7eeeb 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
| @@ -124,6 +124,8 @@ trace_a_syscall: | |||
| 124 | li a1, 0 | 124 | li a1, 0 |
| 125 | jal do_syscall_trace | 125 | jal do_syscall_trace |
| 126 | 126 | ||
| 127 | move t0, s0 | ||
| 128 | RESTORE_STATIC | ||
| 127 | ld a0, PT_R4(sp) # Restore argument registers | 129 | ld a0, PT_R4(sp) # Restore argument registers |
| 128 | ld a1, PT_R5(sp) | 130 | ld a1, PT_R5(sp) |
| 129 | ld a2, PT_R6(sp) | 131 | ld a2, PT_R6(sp) |
| @@ -132,7 +134,7 @@ trace_a_syscall: | |||
| 132 | ld a5, PT_R9(sp) | 134 | ld a5, PT_R9(sp) |
| 133 | ld a6, PT_R10(sp) | 135 | ld a6, PT_R10(sp) |
| 134 | ld a7, PT_R11(sp) # For indirect syscalls | 136 | ld a7, PT_R11(sp) # For indirect syscalls |
| 135 | jalr s0 | 137 | jalr t0 |
| 136 | 138 | ||
| 137 | li t0, -EMAXERRNO - 1 # error? | 139 | li t0, -EMAXERRNO - 1 # error? |
| 138 | sltu t0, t0, v0 | 140 | sltu t0, t0, v0 |