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

Commit 85b05496 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Avoid duplicate do_syscall_trace calls on return from sigreturn. 


    
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 04a7052c

arch/mips/kernel/irixsig.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -279,8 +279,6 @@ irix_sigreturn(struct pt_regs *regs) 
	/*

	/*

	 * Don't let your children do this ...

	 * Don't let your children do this ...

	 */

	 */

	if (current_thread_info()->flags & TIF_SYSCALL_TRACE)

		do_syscall_trace(regs, 1);

	__asm__ __volatile__(

	__asm__ __volatile__(

		"move\t$29,%0\n\t"

		"move\t$29,%0\n\t"

		"j\tsyscall_exit"

		"j\tsyscall_exit"
@@ -783,8 +781,6 @@ asmlinkage void irix_setcontext(struct pt_regs *regs) 
	/*

	/*

	 * Don't let your children do this ...

	 * Don't let your children do this ...

	 */

	 */

	if (current_thread_info()->flags & TIF_SYSCALL_TRACE)

		do_syscall_trace(regs, 1);

	__asm__ __volatile__(

	__asm__ __volatile__(

		"move\t$29,%0\n\t"

		"move\t$29,%0\n\t"

		"j\tsyscall_exit"

		"j\tsyscall_exit"

arch/mips/kernel/signal.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -220,8 +220,6 @@ _sys_sigreturn(nabi_no_regargs struct pt_regs regs) 
	/*

	/*

	 * Don't let your children do this ...

	 * Don't let your children do this ...

	 */

	 */

	if (current_thread_info()->flags & TIF_SYSCALL_TRACE)

		do_syscall_trace(&regs, 1);

	__asm__ __volatile__(

	__asm__ __volatile__(

		"move\t$29, %0\n\t"

		"move\t$29, %0\n\t"

		"j\tsyscall_exit"

		"j\tsyscall_exit"

arch/mips/kernel/signal32.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -497,8 +497,6 @@ _sys32_sigreturn(nabi_no_regargs struct pt_regs regs) 
	/*

	/*

	 * Don't let your children do this ...

	 * Don't let your children do this ...

	 */

	 */

	if (current_thread_info()->flags & TIF_SYSCALL_TRACE)

		do_syscall_trace(&regs, 1);

	__asm__ __volatile__(

	__asm__ __volatile__(

		"move\t$29, %0\n\t"

		"move\t$29, %0\n\t"

		"j\tsyscall_exit"

		"j\tsyscall_exit"