From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752168AbaBSLQL (ORCPT ); Wed, 19 Feb 2014 06:16:11 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:54371 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751245AbaBSLQJ (ORCPT ); Wed, 19 Feb 2014 06:16:09 -0500 Message-ID: <53049272.8030706@linaro.org> Date: Wed, 19 Feb 2014 20:16:02 +0900 From: AKASHI Takahiro User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Will Deacon CC: "wad@chromium.org" , Catalin Marinas , "arndb@arndb.de" , "linux-arm-kernel@lists.infradead.org" , "linaro-kernel@lists.linaro.org" , "linux-kernel@vger.kernel.org" , "patches@linaro.org" Subject: Re: [PATCH 2/2] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h References: <1391767892-5395-1-git-send-email-takahiro.akashi@linaro.org> <1391767892-5395-3-git-send-email-takahiro.akashi@linaro.org> <20140217193210.GI26590@mudshark.cambridge.arm.com> In-Reply-To: <20140217193210.GI26590@mudshark.cambridge.arm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/18/2014 04:32 AM, Will Deacon wrote: > On Fri, Feb 07, 2014 at 10:11:32AM +0000, AKASHI Takahiro wrote: >> kernel/seccomp.c includes linux/compat.h and, indicrectly, asm/compat.h >> via asm/syscall.h. Due to the duplicated definition of is_compat_task, >> compiling this file will fail in the case of !CONFIG_COMPAT. >> This patch makes the definition in asm/compat.h valid only if necessary. >> >> Signed-off-by: AKASHI Takahiro >> --- >> arch/arm64/include/asm/compat.h | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h >> index fda2704..72f3b18 100644 >> --- a/arch/arm64/include/asm/compat.h >> +++ b/arch/arm64/include/asm/compat.h >> @@ -305,10 +305,12 @@ static inline int is_compat_thread(struct thread_info *thread) >> >> #else /* !CONFIG_COMPAT */ >> >> +#ifndef is_compat_task /* it's there in linux/compat.h */ >> static inline int is_compat_task(void) >> { >> return 0; >> } >> +#endif > > This is horrible! Can we instead include linux/compat.h where we need this > macro and then remove this definition? It's fine with me, but asm/compat.h is also included in hw_breakpoint.c, process.c, ptrace.c and signal.c. After replacing asm/compat.h to linux/compat.h in these files, I could successfully built the kernel, but I can't guarantee that the kernel works without any problem :-) Anyway I will go forward with this change. -Takahiro AKASHI > Will >