From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Guy Briggs Subject: Re: [PATCH] MIPS: use current instead of task in syscall_get_arch Date: Thu, 10 Apr 2014 22:43:34 -0400 Message-ID: <20140411024334.GD24821@madcap2.tricolour.ca> References: <1397183132-16528-1-git-send-email-eparis@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1397183132-16528-1-git-send-email-eparis@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: Eric Paris Cc: linux-mips@linux-mips.org, James Hogan , linux-audit@redhat.com, markos.chandras@imgtec.com, Paul Burton List-Id: linux-audit@redhat.com On 14/04/10, Eric Paris wrote: > 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 Signed-off-by: Richard Guy Briggs > --- > 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 - RGB -- Richard Guy Briggs Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545