From: Richard Guy Briggs <rgb@redhat.com> To: Eric Paris <eparis@redhat.com> Cc: linux-audit@redhat.com, Paul Burton <paul.burton@imgtec.com>, James Hogan <james.hogan@imgtec.com>, markos.chandras@imgtec.com, linux-mips@linux-mips.org Subject: Re: [PATCH] MIPS: use current instead of task in syscall_get_arch Date: Thu, 10 Apr 2014 22:43:34 -0400 [thread overview] Message-ID: <20140411024334.GD24821@madcap2.tricolour.ca> (raw) In-Reply-To: <1397183132-16528-1-git-send-email-eparis@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 <eparis@redhat.com> > Cc: markos.chandras@imgtec.com > Cc: Paul Burton <paul.burton@imgtec.com> > Cc: James Hogan <james.hogan@imgtec.com> > Cc: linux-mips@linux-mips.org Signed-off-by: Richard Guy Briggs <rgb@redhat.com> > --- > 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 <rbriggs@redhat.com> 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
WARNING: multiple messages have this Message-ID (diff)
From: Richard Guy Briggs <rgb@redhat.com> To: Eric Paris <eparis@redhat.com> Cc: linux-mips@linux-mips.org, James Hogan <james.hogan@imgtec.com>, linux-audit@redhat.com, markos.chandras@imgtec.com, Paul Burton <paul.burton@imgtec.com> Subject: Re: [PATCH] MIPS: use current instead of task in syscall_get_arch Date: Thu, 10 Apr 2014 22:43:34 -0400 [thread overview] Message-ID: <20140411024334.GD24821@madcap2.tricolour.ca> (raw) In-Reply-To: <1397183132-16528-1-git-send-email-eparis@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 <eparis@redhat.com> > Cc: markos.chandras@imgtec.com > Cc: Paul Burton <paul.burton@imgtec.com> > Cc: James Hogan <james.hogan@imgtec.com> > Cc: linux-mips@linux-mips.org Signed-off-by: Richard Guy Briggs <rgb@redhat.com> > --- > 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 <rbriggs@redhat.com> 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
next prev parent reply other threads:[~2014-04-11 2:43 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-04-11 2:25 [PATCH] MIPS: use current instead of task in syscall_get_arch Eric Paris 2014-04-11 2:25 ` Eric Paris 2014-04-11 2:43 ` Richard Guy Briggs [this message] 2014-04-11 2:43 ` Richard Guy Briggs 2014-04-11 10:18 ` Markos Chandras 2014-04-11 10:18 ` Markos Chandras
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20140411024334.GD24821@madcap2.tricolour.ca \ --to=rgb@redhat.com \ --cc=eparis@redhat.com \ --cc=james.hogan@imgtec.com \ --cc=linux-audit@redhat.com \ --cc=linux-mips@linux-mips.org \ --cc=markos.chandras@imgtec.com \ --cc=paul.burton@imgtec.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.