[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140422155642.GA20182@madcap2.tricolour.ca>
Date: Tue, 22 Apr 2014 11:56:42 -0400
From: Richard Guy Briggs <rgb@...hat.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Eric Paris <eparis@...hat.com>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, sparclinux@...r.kernel.org
Subject: Re: linux-next: build failure after merge of the audit tree
On 14/04/22, Stephen Rothwell wrote:
> Hi Eric,
>
> After merging the audit tree, today's linux-next build (sparc defconfig)
> failed like this:
>
> In file included from include/linux/audit.h:29:0,
> from mm/mmap.c:33:
> arch/sparc/include/asm/syscall.h: In function 'syscall_get_arch':
> arch/sparc/include/asm/syscall.h:131:9: error: 'TIF_32BIT' undeclared (first use in this function)
> arch/sparc/include/asm/syscall.h:131:9: note: each undeclared identifier is reported only once for each function it appears in
>
> And many more ...
>
> Caused by commit 374c0c054122 ("ARCH: AUDIT: implement syscall_get_arch
> for all arches").
>
> I applied this patch for today:
>
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Tue, 22 Apr 2014 16:18:53 +1000
> Subject: [PATCH] fix ARCH: AUDIT: implement syscall_get_arch for all arches
>
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
Looks good to me. Thanks.
Acked-by: Richard Guy Briggs <rgb@...hat.com>
> ---
> arch/sparc/include/asm/syscall.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h
> index fed3d511b108..a5a8153766b3 100644
> --- a/arch/sparc/include/asm/syscall.h
> +++ b/arch/sparc/include/asm/syscall.h
> @@ -128,8 +128,12 @@ static inline void syscall_set_arguments(struct task_struct *task,
>
> static inline int syscall_get_arch(void)
> {
> +#if defined(__sparc__) && defined(__arch64__)
> return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC
> : AUDIT_ARCH_SPARC64;
> +#else
> + return AUDIT_ARCH_SPARC;
> +#endif
> }
>
> #endif /* __ASM_SPARC_SYSCALL_H */
> --
> 1.9.2
>
> --
> Cheers,
> Stephen Rothwell sfr@...b.auug.org.au
- RGB
--
Richard Guy Briggs <rbriggs@...hat.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists