Merge remote-tracking branch 'audit/master'

Conflicts:
	arch/mips/include/asm/syscall.h
	arch/mips/kernel/ptrace.c
	arch/x86/Kconfig
	kernel/audit.c

diff --cc arch/mips/include/asm/syscall.h
index 17960fe7a8ce4ef21b7a94cca10c7b5af61cec17,eac2df28bf732ac5e18d4a6b1a6de383e8ef9146..93b3b86c293c854538fb33f5b7b45e162e7b8471
--- 1/arch/mips/include/asm/syscall.h
--- 2/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@@ -129,12 -105,9 +129,12 @@@ extern const unsigned long sysn32_call_
  
  static inline int syscall_get_arch(void)
  {
-       int arch = EM_MIPS;
+       int arch = AUDIT_ARCH_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;

diff --cc arch/mips/kernel/ptrace.c
index f639ccd5060c18d85f33a33f2cc4bce81605ae3b,8b393bcf7919a98b30c155dfc3421fb6f10f9614..d8a76f97a053d8097593fad41c06ef8afc21fee6
--- 1/arch/mips/kernel/ptrace.c
--- 2/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@@ -649,11 -677,8 +649,9 @@@ asmlinkage long syscall_trace_enter(str
        if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
                trace_sys_enter(regs, regs->regs[2]);
  
-       audit_syscall_entry(syscall_get_arch(),
-                           syscall,
-                           regs->regs[4], regs->regs[5],
 -      audit_syscall_entry(regs->regs[2], regs->regs[4], regs->regs[5],
++      audit_syscall_entry(syscall, regs->regs[4], regs->regs[5],
                            regs->regs[6], regs->regs[7]);
 +      return syscall;
  }
  
  /*

diff --cc arch/s390/kernel/ptrace.c
Simple merge

diff --cc arch/um/kernel/ptrace.c
Simple merge

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc include/uapi/linux/audit.h
Simple merge