Skip to content

Commit

Permalink
[MIPS] Fix return path of sysmips(MIPS_ATOMIC_SET, ...)
Browse files Browse the repository at this point in the history
    
The way we were doing things does no longer work on 2.6.
    
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Dec 1, 2005
1 parent fe3d728 commit edcb98d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
14 changes: 1 addition & 13 deletions arch/mips/kernel/scall32-o32.S
Original file line number Diff line number Diff line change
Expand Up @@ -241,19 +241,7 @@ illegal_syscall:
sw zero, PT_R7(sp) # success
sw v0, PT_R2(sp) # result

/* Success, so skip usual error handling garbage. */
lw a2, TI_FLAGS($28) # syscall tracing enabled?
li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
and t0, a2, t0
bnez t0, 1f

j o32_syscall_exit

1: SAVE_STATIC
move a0, sp
li a1, 1
jal do_syscall_trace
j syscall_exit
j o32_syscall_exit # continue like a normal syscall

no_mem: li v0, -ENOMEM
jr ra
Expand Down
14 changes: 1 addition & 13 deletions arch/mips/kernel/scall64-64.S
Original file line number Diff line number Diff line change
Expand Up @@ -174,19 +174,7 @@ illegal_syscall:
sd zero, PT_R7(sp) # success
sd v0, PT_R2(sp) # result

/* Success, so skip usual error handling garbage. */
li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
LONG_L a2, TI_FLAGS($28) # syscall tracing enabled?
and t0, a2, t0
bnez t0, 1f

j n64_syscall_exit

1: SAVE_STATIC
move a0, sp
li a1, 1
jal do_syscall_trace
j syscall_exit
j n64_syscall_exit # continue like a normal syscall

no_mem: li v0, -ENOMEM
jr ra
Expand Down

0 comments on commit edcb98d

Please sign in to comment.