projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/topic...
[cascardo/linux.git]
/
arch
/
mips
/
include
/
asm
/
syscall.h
diff --git
a/arch/mips/include/asm/syscall.h
b/arch/mips/include/asm/syscall.h
index
33e8dbf
..
f35b131
100644
(file)
--- a/
arch/mips/include/asm/syscall.h
+++ b/
arch/mips/include/asm/syscall.h
@@
-13,6
+13,7
@@
#ifndef __ASM_MIPS_SYSCALL_H
#define __ASM_MIPS_SYSCALL_H
#ifndef __ASM_MIPS_SYSCALL_H
#define __ASM_MIPS_SYSCALL_H
+#include <linux/compiler.h>
#include <linux/audit.h>
#include <linux/elf-em.h>
#include <linux/kernel.h>
#include <linux/audit.h>
#include <linux/elf-em.h>
#include <linux/kernel.h>
@@
-39,14
+40,14
@@
static inline unsigned long mips_get_syscall_arg(unsigned long *arg,
#ifdef CONFIG_32BIT
case 4: case 5: case 6: case 7:
#ifdef CONFIG_32BIT
case 4: case 5: case 6: case 7:
- return get_user(*arg, (int *)usp +
4 *
n);
+ return get_user(*arg, (int *)usp + n);
#endif
#ifdef CONFIG_64BIT
case 4: case 5: case 6: case 7:
#ifdef CONFIG_MIPS32_O32
if (test_thread_flag(TIF_32BIT_REGS))
#endif
#ifdef CONFIG_64BIT
case 4: case 5: case 6: case 7:
#ifdef CONFIG_MIPS32_O32
if (test_thread_flag(TIF_32BIT_REGS))
- return get_user(*arg, (int *)usp +
4 *
n);
+ return get_user(*arg, (int *)usp + n);
else
#endif
*arg = regs->regs[4 + n];
else
#endif
*arg = regs->regs[4 + n];
@@
-57,6
+58,8
@@
static inline unsigned long mips_get_syscall_arg(unsigned long *arg,
default:
BUG();
}
default:
BUG();
}
+
+ unreachable();
}
static inline long syscall_get_return_value(struct task_struct *task,
}
static inline long syscall_get_return_value(struct task_struct *task,
@@
-83,11
+86,10
@@
static inline void syscall_get_arguments(struct task_struct *task,
unsigned int i, unsigned int n,
unsigned long *args)
{
unsigned int i, unsigned int n,
unsigned long *args)
{
- unsigned long arg;
int ret;
while (n--)
int ret;
while (n--)
- ret |= mips_get_syscall_arg(
&arg
, task, regs, i++);
+ ret |= mips_get_syscall_arg(
args++
, task, regs, i++);
/*
* No way to communicate an error because this is a void function.
/*
* No way to communicate an error because this is a void function.