>From 129947be924678e041ab0f7c7bcf0a436d4116a7 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Thu, 10 Apr 2014 22:19:26 -0400 Subject: [PATCH] MIPS: use current instead of task in syscall_get_arch 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 Cc: markos.chandras@imgtec.com Cc: Paul Burton Cc: James Hogan Cc: linux-mips@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