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

0f405bf7 · Linus Torvalds <[email protected]> · 2015-08-16 15:39:31 -07:00

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

Commit: 0f405bf75ffcf2abe64fb735facd4ef7b89df27f
Parents: 01565479 · 9f161439

Merge commit. Changes below are compared with the first parent: 01565479.

Changes

2 files changed · +2 −2

File	Status	Add	Del	Content
arch/mips/kernel/scall64-64.S	modified	+1	−1	View file
arch/mips/kernel/scall64-n32.S	modified	+1	−1	View file

arch/mips/kernel/scall64-64.S

View file

diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index ad4d446..a6f6b76 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -80,7 +80,7 @@ syscall_trace_entry:
 	SAVE_STATIC
 	move	s0, t2
 	move	a0, sp
-	daddiu	a1, v0, __NR_64_Linux
+	move	a1, v0
 	jal	syscall_trace_enter
 
 	bltz	v0, 2f			# seccomp failed? Skip syscall

arch/mips/kernel/scall64-n32.S

View file

diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 446cc65..4b20106 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