Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edcb98d1 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Fix return path of sysmips(MIPS_ATOMIC_SET, ...) 


    
The way we were doing things does no longer work on 2.6.
    
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent fe3d7285

arch/mips/kernel/scall32-o32.S

+1 −13
Original line number Original line Diff line number Diff line
@@ -241,19 +241,7 @@ illegal_syscall: 
	sw	zero, PT_R7(sp)		# success

	sw	zero, PT_R7(sp)		# success

	sw	v0, PT_R2(sp)		# result

	sw	v0, PT_R2(sp)		# result





	/* Success, so skip usual error handling garbage.  */

	j	o32_syscall_exit	# continue like a normal syscall

	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





no_mem:	li	v0, -ENOMEM

no_mem:	li	v0, -ENOMEM

	jr	ra

	jr	ra

arch/mips/kernel/scall64-64.S

+1 −13
Original line number Original line Diff line number Diff line
@@ -174,19 +174,7 @@ illegal_syscall: 
	sd	zero, PT_R7(sp)		# success

	sd	zero, PT_R7(sp)		# success

	sd	v0, PT_R2(sp)		# result

	sd	v0, PT_R2(sp)		# result





	/* Success, so skip usual error handling garbage.  */

	j	n64_syscall_exit	# continue like a normal syscall

	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





no_mem:	li	v0, -ENOMEM

no_mem:	li	v0, -ENOMEM

	jr	ra

	jr	ra