From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Eric Paris <eparis@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Richard Briggs <rgb@redhat.com>,
sparclinux@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the audit tree
Date: Wed, 23 Apr 2014 07:27:18 +1000 [thread overview]
Message-ID: <20140423072718.56b31d2afcd65c7b210a1d77@canb.auug.org.au> (raw)
In-Reply-To: <1398184360.2596.7.camel@flatline.rdu.redhat.com>
[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]
Hi Eric,
On Tue, 22 Apr 2014 12:32:40 -0400 Eric Paris <eparis@redhat.com> wrote:
>
> I swear I saw this and I fixed it. Drat. Do we want to do it this way?
> Above in syscall_get_arguments() they use
>
> #ifdef CONFIG_SPARC64
> if (test_tsk_thread_flag(task, TIF_32BIT))
> zero_extend = 1;
> #endif
>
> Is CONFIG_SPARC64 a better choice than:
> defined(__sparc__) && defined(__arch64__)
I have no idea, I just copied the test from thread_info.h.
> Maybe even better would be to copy what you suggested in powerpc:
That would be better, except ...
> diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h
> index fed3d51..49f71fd 100644
> --- a/arch/sparc/include/asm/syscall.h
> +++ b/arch/sparc/include/asm/syscall.h
> @@ -128,8 +128,7 @@ static inline void syscall_set_arguments(struct task_struct *task,
>
> static inline int syscall_get_arch(void)
> {
> - return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC
> - : AUDIT_ARCH_SPARC64;
> + return is_32bit_task() ? AUDIT_ARCH_SPARC : AUDIT_ARCH_SPARC64;
> }
>
> #endif /* __ASM_SPARC_SYSCALL_H */
> diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
> index 96efa7a..acd2be0 100644
> --- a/arch/sparc/include/asm/thread_info_32.h
> +++ b/arch/sparc/include/asm/thread_info_32.h
> @@ -130,6 +130,8 @@ register struct thread_info *current_thread_info_reg asm("g6");
> #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | \
> _TIF_SIGPENDING)
>
> +#define is_32bit_task() (0)
Shouldn't that be (1) ?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-04-22 21:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-22 6:22 linux-next: build failure after merge of the audit tree Stephen Rothwell
2014-04-22 15:56 ` Richard Guy Briggs
2014-04-22 16:32 ` Eric Paris
2014-04-22 21:27 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-11-06 6:27 Stephen Rothwell
2013-11-06 16:54 ` Eric Paris
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=20140423072718.56b31d2afcd65c7b210a1d77@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=eparis@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rgb@redhat.com \
--cc=sparclinux@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).