tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS bugfix from Ralf Baechle:
"Only a single MIPS fix - the math when invoking syscall_trace_enter
was wrong"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Fix seccomp syscall argument for MIPS64

Linus Torvalds 0f405bf7 01565479

+2 -2
unified split
+1 -1
arch/mips/kernel/scall64-64.S
··· 80 80 SAVE_STATIC 81 81 move s0, t2 82 82 move a0, sp 83 - daddiu a1, v0, __NR_64_Linux 83 + move a1, v0 84 84 jal syscall_trace_enter 85 85 86 86 bltz v0, 2f # seccomp failed? Skip syscall
+1 -1
arch/mips/kernel/scall64-n32.S
··· 72 72 SAVE_STATIC 73 73 move s0, t2 74 74 move a0, sp 75 - daddiu a1, v0, __NR_N32_Linux 75 + move a1, v0 76 76 jal syscall_trace_enter 77 77 78 78 bltz v0, 2f # seccomp failed? Skip syscall