diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-04-10 03:14:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-04-10 03:14:42 -0400 |
| commit | 54bbfe75cbb10384b0a62efae80fde21deea1dd0 (patch) | |
| tree | eed22c29cdecce36153bbb83ee7a9da7eed60ccd /arch/arc | |
| parent | ddb20d1d3aed8f130519c0a29cd5392efcc067b8 (diff) | |
| parent | 771acc7e4a6e5dba779cb1a7fd851a164bc81033 (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/include/asm/syscall.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arc/include/asm/syscall.h b/arch/arc/include/asm/syscall.h index 29de09804306..c7a4201ed62b 100644 --- a/arch/arc/include/asm/syscall.h +++ b/arch/arc/include/asm/syscall.h | |||
| @@ -55,12 +55,11 @@ syscall_set_return_value(struct task_struct *task, struct pt_regs *regs, | |||
| 55 | */ | 55 | */ |
| 56 | static inline void | 56 | static inline void |
| 57 | syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, | 57 | syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, |
| 58 | unsigned int i, unsigned int n, unsigned long *args) | 58 | unsigned long *args) |
| 59 | { | 59 | { |
| 60 | unsigned long *inside_ptregs = &(regs->r0); | 60 | unsigned long *inside_ptregs = &(regs->r0); |
| 61 | inside_ptregs -= i; | 61 | unsigned int n = 6; |
| 62 | 62 | unsigned int i = 0; | |
| 63 | BUG_ON((i + n) > 6); | ||
| 64 | 63 | ||
| 65 | while (n--) { | 64 | while (n--) { |
| 66 | args[i++] = (*inside_ptregs); | 65 | args[i++] = (*inside_ptregs); |