diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-11-04 10:01:20 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-11-04 10:01:20 -0800 |
commit | 49bd04cb11e57c4cd4d2c00feca898537dd6db1f (patch) | |
tree | 846c594b2b1d2f203c24ff32569b6c615822a5dc /arch/mips/kernel/scall64-n32.S | |
parent | 260409578ecbf7ce1725b85f9c082312bff808c0 (diff) | |
parent | 12ba397b828b7e7f5d28a73e9a2ee14470b7edc7 (diff) |
Merge tag 'v4.1.12-rt12' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel into v4.1/topic/rtv4.1/topic/rt
v4.1.12-rt12
Diffstat (limited to 'arch/mips/kernel/scall64-n32.S')
-rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 446cc654da56..4b2010654c46 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S @@ -72,7 +72,7 @@ n32_syscall_trace_entry: SAVE_STATIC move s0, t2 move a0, sp - daddiu a1, v0, __NR_N32_Linux + move a1, v0 jal syscall_trace_enter bltz v0, 2f # seccomp failed? Skip syscall |