In commit 6e345746 Markos started using task to determine 64bit vs 32bit instead of it being completely CONFIG based. In commit 5e937a9a we dropped the 'task' argument to syscall_get_arch() across the entire system. This obviously results in a build failure when Linus's and the audit tree were merged. This patch should be applied as part of the merge conflict, as both sides of the merge are correct and the failure happens AT the merge. The fix is simple. The task is always current. Use current. Signed-off-by: Eric Paris <eparis(a)redhat.com&gt; Cc: markos.chandras(a)imgtec.com Cc: Paul Burton <paul.burton(a)imgtec.com&gt; Cc: James Hogan <james.hogan(a)imgtec.com&gt; Cc: linux-mips(a)linux-mips.org --- arch/mips/include/asm/syscall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h index d79cded..1258884 100644 --- a/arch/mips/include/asm/syscall.h +++ b/arch/mips/include/asm/syscall.h @@ -131,7 +131,7 @@ static inline int syscall_get_arch(void) { int arch = EM_MIPS; #ifdef CONFIG_64BIT - if (!test_tsk_thread_flag(task, TIF_32BIT_REGS)) + if (!test_tsk_thread_flag(current, TIF_32BIT_REGS)) arch |= __AUDIT_ARCH_64BIT; #endif #if defined(__LITTLE_ENDIAN) -- 1.9.0