From c2d9f17757310484ab4fd65954f5f9850f6a1349 Mon Sep 17 00:00:00 2001 From: Lars Persson Date: Tue, 3 Feb 2015 17:08:17 +0100 Subject: MIPS: Fix syscall_get_nr for the syscall exit tracing. Register 2 is alredy overwritten by the return value when syscall_trace_leave() is called. Signed-off-by: Lars Persson Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/9187/ Signed-off-by: Ralf Baechle --- arch/mips/include/asm/syscall.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'arch/mips/include/asm/syscall.h') diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h index bb7963753730..6499d93ae68d 100644 --- a/arch/mips/include/asm/syscall.h +++ b/arch/mips/include/asm/syscall.h @@ -29,13 +29,7 @@ static inline long syscall_get_nr(struct task_struct *task, struct pt_regs *regs) { - /* O32 ABI syscall() - Either 64-bit with O32 or 32-bit */ - if ((config_enabled(CONFIG_32BIT) || - test_tsk_thread_flag(task, TIF_32BIT_REGS)) && - (regs->regs[2] == __NR_syscall)) - return regs->regs[4]; - else - return regs->regs[2]; + return current_thread_info()->syscall; } static inline unsigned long mips_get_syscall_arg(unsigned long *arg, -- cgit