summaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorIngo Molnar2019-04-10 09:14:42 +0200
committerIngo Molnar2019-04-10 09:14:42 +0200
commit54bbfe75cbb10384b0a62efae80fde21deea1dd0 (patch)
treeeed22c29cdecce36153bbb83ee7a9da7eed60ccd /arch/microblaze
parentlocking/rwsem: Optimize down_read_trylock() (diff)
parentBluetooth: btusb: request wake pin with NOAUTOEN (diff)
downloadkernel-qcow2-linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.tar.gz
kernel-qcow2-linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.tar.xz
kernel-qcow2-linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.zip
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/include/asm/syscall.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/syscall.h b/arch/microblaze/include/asm/syscall.h
index 220decd605a4..833d3a53dab3 100644
--- a/arch/microblaze/include/asm/syscall.h
+++ b/arch/microblaze/include/asm/syscall.h
@@ -82,18 +82,22 @@ static inline void microblaze_set_syscall_arg(struct pt_regs *regs,
static inline void syscall_get_arguments(struct task_struct *task,
struct pt_regs *regs,
- unsigned int i, unsigned int n,
unsigned long *args)
{
+ unsigned int i = 0;
+ unsigned int n = 6;
+
while (n--)
*args++ = microblaze_get_syscall_arg(regs, i++);
}
static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
- unsigned int i, unsigned int n,
const unsigned long *args)
{
+ unsigned int i = 0;
+ unsigned int n = 6;
+
while (n--)
microblaze_set_syscall_arg(regs, i++, *args++);
}