Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/mips/kernel/scall64-64.S

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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