diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-16 18:39:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-16 18:39:31 -0400 |
| commit | 0f405bf75ffcf2abe64fb735facd4ef7b89df27f (patch) | |
| tree | 4928846c34bb9c70807154d61600b3220ea431cd | |
| parent | 01565479e99882e873e4dd2f6f067b7cba3acf8f (diff) | |
| parent | 9f161439e4104b641a7bfb9b89581d801159fec8 (diff) | |
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
| -rw-r--r-- | arch/mips/kernel/scall64-64.S | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index ad4d44635c76..a6f6b762c47a 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
| @@ -80,7 +80,7 @@ syscall_trace_entry: | |||
| 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 |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 446cc654da56..4b2010654c46 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -72,7 +72,7 @@ n32_syscall_trace_entry: | |||
| 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 |