From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: Will Deacon <will.deacon@arm.com>
Cc: "wad@chromium.org" <wad@chromium.org>,
Catalin Marinas <Catalin.Marinas@arm.com>,
"arndb@arndb.de" <arndb@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linaro-kernel@lists.linaro.org" <linaro-kernel@lists.linaro.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"patches@linaro.org" <patches@linaro.org>
Subject: Re: [PATCH 2/2] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h
Date: Wed, 19 Feb 2014 20:16:02 +0900 [thread overview]
Message-ID: <53049272.8030706@linaro.org> (raw)
In-Reply-To: <20140217193210.GI26590@mudshark.cambridge.arm.com>
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 <takahiro.akashi@linaro.org>
>> ---
>> 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
>
next prev parent reply other threads:[~2014-02-19 11:16 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-07 10:11 [PATCH 0/2] arm64: Add seccomp support AKASHI Takahiro
2014-02-07 10:11 ` [PATCH 1/2] " AKASHI Takahiro
2014-02-07 14:44 ` Arnd Bergmann
[not found] ` <CAB5YjtB6XnXRd90AUw=rJCOBKyfcngTQd3Kxft33XLCK+K=Vuw@mail.gmail.com>
2014-02-12 11:05 ` Arnd Bergmann
2014-02-12 11:17 ` Arnd Bergmann
2014-02-18 15:38 ` Catalin Marinas
2014-02-19 11:39 ` AKASHI Takahiro
2014-02-19 16:41 ` Catalin Marinas
2014-02-20 0:34 ` AKASHI Takahiro
2014-02-07 10:11 ` [PATCH 2/2] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h AKASHI Takahiro
2014-02-17 19:32 ` Will Deacon
2014-02-19 11:16 ` AKASHI Takahiro [this message]
2014-02-25 9:20 ` [PATCH v2 0/3] arm64: Add seccomp support AKASHI Takahiro
2014-02-25 9:20 ` [PATCH v2 1/3] asm-generic: Add generic seccomp.h for secure computing mode 1 AKASHI Takahiro
2014-02-25 9:20 ` [PATCH v2 2/3] arm64: Add seccomp support AKASHI Takahiro
2014-02-28 17:20 ` Will Deacon
2014-03-06 2:34 ` AKASHI Takahiro
2014-03-06 15:24 ` Will Deacon
2014-02-25 9:20 ` [PATCH v2 3/3] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h AKASHI Takahiro
2014-02-28 16:58 ` Will Deacon
2014-03-13 10:17 ` [PATCH v3 0/3] arm64: Add seccomp support AKASHI Takahiro
2014-03-13 10:17 ` [PATCH v3 1/3] asm-generic: Add generic seccomp.h for secure computing mode 1 AKASHI Takahiro
2014-03-14 17:08 ` Catalin Marinas
2014-03-13 10:17 ` [PATCH v3 2/3] arm64: Add seccomp support AKASHI Takahiro
2014-03-13 10:17 ` [PATCH v3 3/3] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h AKASHI Takahiro
2014-03-15 5:50 ` [PATCH_v4 0/2] arm64: Add seccomp support AKASHI Takahiro
2014-03-15 5:50 ` [PATCH_v4 1/2] asm-generic: Add generic seccomp.h for secure computing mode 1 AKASHI Takahiro
2014-03-15 5:50 ` [PATCH_v4 2/2] arm64: Add seccomp support AKASHI Takahiro
2014-06-25 14:53 ` [PATCH_v4 0/2] " Mark Salter
2014-06-26 0:57 ` AKASHI Takahiro
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=53049272.8030706@linaro.org \
--to=takahiro.akashi@linaro.org \
--cc=Catalin.Marinas@arm.com \
--cc=arndb@arndb.de \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@linaro.org \
--cc=wad@chromium.org \
--cc=will.deacon@arm.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: 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
Powered by JetHome