1 files changed, 31 insertions, 4 deletions

diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h
index f35b131977e6..17960fe7a8ce 100644
--- a/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@ -14,17 +14,28 @@
 #define __ASM_MIPS_SYSCALL_H
 
 #include <linux/compiler.h>
-#include <linux/audit.h>
+#include <uapi/linux/audit.h>
 #include <linux/elf-em.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/uaccess.h>
 #include <asm/ptrace.h>
+#include <asm/unistd.h>
+
+#ifndef __NR_syscall /* Only defined if _MIPS_SIM == _MIPS_SIM_ABI32 */
+#define __NR_syscall 4000
+#endif
 
 static inline long syscall_get_nr(struct task_struct *task,
                                   struct pt_regs *regs)
 {
-        return regs->regs[2];
+        /* 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))
+                return regs->regs[4];
+        else
+                return regs->regs[2];
 }
 
 static inline unsigned long mips_get_syscall_arg(unsigned long *arg,
@@ -68,6 +79,12 @@ static inline long syscall_get_return_value(struct task_struct *task,
         return regs->regs[2];
 }
 
+static inline void syscall_rollback(struct task_struct *task,
+                                    struct pt_regs *regs)
+{
+        /* Do nothing */
+}
+
 static inline void syscall_set_return_value(struct task_struct *task,
                                             struct pt_regs *regs,
                                             int error, long val)
@@ -87,6 +104,13 @@ static inline void syscall_get_arguments(struct task_struct *task,
                                          unsigned long *args)
 {
         int ret;
+        /* 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)) {
+                i++;
+                n++;
+        }
 
         while (n--)
                 ret |= mips_get_syscall_arg(args++, task, regs, i++);
@@ -103,11 +127,14 @@ extern const unsigned long sys_call_table[];
 extern const unsigned long sys32_call_table[];
 extern const unsigned long sysn32_call_table[];
 
-static inline int __syscall_get_arch(void)
+static inline int syscall_get_arch(void)
 {
         int arch = EM_MIPS;
 #ifdef CONFIG_64BIT
-        arch |=  __AUDIT_ARCH_64BIT;
+        if (!test_thread_flag(TIF_32BIT_REGS))
+                arch |= __AUDIT_ARCH_64BIT;
+        if (test_thread_flag(TIF_32BIT_ADDR))
+                arch |= __AUDIT_ARCH_CONVENTION_MIPS64_N32;
 #endif
 #if defined(__LITTLE_ENDIAN)
         arch |=  __AUDIT_ARCH_LE;