diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-29 08:42:07 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-29 08:42:07 (GMT) |
| commit | 6aa447bcbb444cd1b738613a20627f288d631665 (patch) | |
| tree | 62030bb14be0006248181305ac1fe377a99e5b65 /arch/mips/include/asm/syscall.h | |
| parent | abedf8e2419fb873d919dd74de2e84b510259339 (diff) | |
| parent | 48be3a67da7413d62e5efbcf2c73a9dddf61fb96 (diff) | |
| download | linux-6aa447bcbb444cd1b738613a20627f288d631665.tar.xz | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/include/asm/syscall.h')
| -rw-r--r-- | arch/mips/include/asm/syscall.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h index 6499d93..47bc45a 100644 --- a/arch/mips/include/asm/syscall.h +++ b/arch/mips/include/asm/syscall.h @@ -101,10 +101,8 @@ static inline void syscall_get_arguments(struct task_struct *task, /* O32 ABI syscall() - Either 64-bit with O32 or 32-bit */ if ((config_enabled(CONFIG_32BIT) || test_tsk_thread_flag(task, TIF_32BIT_REGS)) && - (regs->regs[2] == __NR_syscall)) { + (regs->regs[2] == __NR_syscall)) i++; - n++; - } while (n--) ret |= mips_get_syscall_arg(args++, task, regs, i++); |