From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755791AbaCPTsx (ORCPT ); Sun, 16 Mar 2014 15:48:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57865 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753839AbaCPTsw (ORCPT ); Sun, 16 Mar 2014 15:48:52 -0400 Date: Sun, 16 Mar 2014 15:48:00 -0400 From: Richard Guy Briggs To: AKASHI Takahiro Cc: will.deacon@arm.com, viro@zeniv.linux.org.uk, eparis@redhat.com, catalin.marinas@arm.com, dsaxena@linaro.org, arndb@arndb.de, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, linux-audit@redhat.com Subject: Re: [PATCH v5 4/4] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h Message-ID: <20140316194800.GP27244@madcap2.tricolour.ca> References: <1394705491-12343-1-git-send-email-takahiro.akashi@linaro.org> <1394861948-28712-1-git-send-email-takahiro.akashi@linaro.org> <1394861948-28712-5-git-send-email-takahiro.akashi@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1394861948-28712-5-git-send-email-takahiro.akashi@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14/03/15, AKASHI Takahiro wrote: > Some kernel files may include both linux/compat.h and asm/compat.h directly > or indirectly. Since both header files contain is_compat_task() under > !CONFIG_COMPAT, compiling them with !CONFIG_COMPAT will eventually fail. > Such files include kernel/auditsc.c, kernel/seccomp.c and init/do_mountfs.c > (do_mountfs.c may read asm/compat.h via asm/ftrace.h once ftrace is > implemented). > > So this patch proactively > 1) removes is_compat_task() under !CONFIG_COMPAT from asm/compat.h > 2) replaces asm/compat.h to linux/compat.h in kernel/*.c, > but asm/compat.h is still necessary in ptrace.c and process.c because > they use is_compat_thread(). > > Signed-off-by: AKASHI Takahiro Acked-by: Richard Guy Briggs > --- > arch/arm64/include/asm/compat.h | 5 ----- > arch/arm64/kernel/hw_breakpoint.c | 2 +- > arch/arm64/kernel/process.c | 1 + > arch/arm64/kernel/ptrace.c | 1 + > arch/arm64/kernel/signal.c | 2 +- > 5 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h > index fda2704..3b334f9 100644 > --- a/arch/arm64/include/asm/compat.h > +++ b/arch/arm64/include/asm/compat.h > @@ -305,11 +305,6 @@ static inline int is_compat_thread(struct thread_info *thread) > > #else /* !CONFIG_COMPAT */ > > -static inline int is_compat_task(void) > -{ > - return 0; > -} > - > static inline int is_compat_thread(struct thread_info *thread) > { > return 0; > diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c > index f17f581..a45e2db 100644 > --- a/arch/arm64/kernel/hw_breakpoint.c > +++ b/arch/arm64/kernel/hw_breakpoint.c > @@ -20,6 +20,7 @@ > > #define pr_fmt(fmt) "hw-breakpoint: " fmt > > +#include > #include > #include > #include > @@ -27,7 +28,6 @@ > #include > #include > > -#include > #include > #include > #include > diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c > index 1c0a9be..fc8a387 100644 > --- a/arch/arm64/kernel/process.c > +++ b/arch/arm64/kernel/process.c > @@ -20,6 +20,7 @@ > > #include > > +#include > #include > #include > #include > diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c > index f606276..c47a3ed 100644 > --- a/arch/arm64/kernel/ptrace.c > +++ b/arch/arm64/kernel/ptrace.c > @@ -19,6 +19,7 @@ > * along with this program. If not, see . > */ > > +#include > #include > #include > #include > diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c > index 890a591..4a09989 100644 > --- a/arch/arm64/kernel/signal.c > +++ b/arch/arm64/kernel/signal.c > @@ -17,6 +17,7 @@ > * along with this program. If not, see . > */ > > +#include > #include > #include > #include > @@ -25,7 +26,6 @@ > #include > #include > > -#include > #include > #include > #include > -- > 1.8.3.2 > - RGB -- Richard Guy Briggs 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