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 committed 11 years ago

Commit 0f405bf2 parents 0156547 9f161432 files · +2 −2Browse files

Unified · Split

2 files

arch/mips/kernel/scall64-64.S +1 −1
arch/mips/kernel/scall64-n32.S +1 −1

arch/mips/kernel/scall64-64.S+1−1

@@ -80,7 +80,7 @@ syscall_trace_entry: · 79 unmodified lines
80	SAVE_STATIC	80	SAVE_STATIC
81	move s0, t2	81	move s0, t2
82	move a0, sp	82	move a0, sp
83	daddiu a1, v0, __NR_64_Linux	83	move a1, v0
84	jal syscall_trace_enter	84	jal syscall_trace_enter
85		85
86	bltz v0, 2f # seccomp failed? Skip syscall	86	bltz v0, 2f # seccomp failed? Skip syscall

arch/mips/kernel/scall64-n32.S+1−1

@@ -72,7 +72,7 @@ n32_syscall_trace_entry: · 71 unmodified lines
72	SAVE_STATIC	72	SAVE_STATIC
73	move s0, t2	73	move s0, t2
74	move a0, sp	74	move a0, sp
75	daddiu a1, v0, __NR_N32_Linux	75	move a1, v0
76	jal syscall_trace_enter	76	jal syscall_trace_enter
77		77
78	bltz v0, 2f # seccomp failed? Skip syscall	78	bltz v0, 2f # seccomp failed? Skip syscall