Commit 0f405bf7 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 01565479 9f161439
...@@ -80,7 +80,7 @@ syscall_trace_entry: ...@@ -80,7 +80,7 @@ syscall_trace_entry:
SAVE_STATIC SAVE_STATIC
move s0, t2 move s0, t2
move a0, sp move a0, sp
daddiu a1, v0, __NR_64_Linux move a1, v0
jal syscall_trace_enter jal syscall_trace_enter
bltz v0, 2f # seccomp failed? Skip syscall bltz v0, 2f # seccomp failed? Skip syscall
......
...@@ -72,7 +72,7 @@ n32_syscall_trace_entry: ...@@ -72,7 +72,7 @@ n32_syscall_trace_entry:
SAVE_STATIC SAVE_STATIC
move s0, t2 move s0, t2
move a0, sp move a0, sp
daddiu a1, v0, __NR_N32_Linux move a1, v0
jal syscall_trace_enter jal syscall_trace_enter
bltz v0, 2f # seccomp failed? Skip syscall bltz v0, 2f # seccomp failed? Skip syscall
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment