Messages in this thread | | | Date | Tue, 22 Apr 2014 13:58:39 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the audit tree with Linus' tree |
| |
Hi Eric,
Today's linux-next merge of the audit tree got a conflict in arch/mips/kernel/ptrace.c between commits 6e34574603f6 ("MIPS: asm: syscall: Define syscall_get_arch") and 1225eb825208("MIPS: ptrace: Move away from secure_computing_strict") from Linus' tree and commit 8ea408a0c1e7 ("ARCH: AUDIT: audit_syscall_entry() should not require the arch") from the audit tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/mips/kernel/ptrace.c index 71f85f427034,8b393bcf7919..000000000000 --- a/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; } /* [unhandled content-type:application/pgp-signature] | |