linux-next: manual merge of the audit tree with the mips tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the audit tree got conflicts in
arch/mips/include/asm/syscall.h and arch/mips/kernel/ptrace.c between
commits cdda64d4d01f ("MIPS: asm: syscall: Define syscall_get_arch"),
d746666c2862 ("MIPS: ptrace: Move away from secure_computing_strict") and
f5179287b016 ("MIPS: Fix randconfig build error") from the mips tree and
commits 74d0bf770dd6 ("syscall_get_arch: remove useless function
arguments") and e8d1226a197d ("audit: use uapi/linux/audit.h for
AUDIT_ARCH declarations") from the audit tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc arch/mips/include/asm/syscall.h
index 6c488c85d791,fc556d8052c9..000000000000
--- a/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@@ -13,8 -13,7 +13,8 @@@
  #ifndef __ASM_MIPS_SYSCALL_H
  #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>
@@@ -132,8 -105,7 +131,8 @@@ static inline int syscall_get_arch(void
  {
        int arch = EM_MIPS;
  #ifdef CONFIG_64BIT
-       if (!test_tsk_thread_flag(task, TIF_32BIT_REGS))
 -      arch |=  __AUDIT_ARCH_64BIT;
++      if (!test_tsk_thread_flag(current, TIF_32BIT_REGS))
 +              arch |= __AUDIT_ARCH_64BIT;
  #endif
  #if defined(__LITTLE_ENDIAN)
        arch |=  __AUDIT_ARCH_LE;
diff --cc arch/mips/kernel/ptrace.c
index 4137a49eae26,65ba622baf3e..000000000000
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@@ -706,11 -671,10 +706,11 @@@ 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(current, regs),
+       audit_syscall_entry(syscall_get_arch(),
 -                          regs->regs[2],
 +                          syscall,
                            regs->regs[4], regs->regs[5],
                            regs->regs[6], regs->regs[7]);
 +      return syscall;
  }
  
  /*

pgpA3CKpndUZl.pgp
Description: PGP signature