From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [PATCH 20/25] arm64:ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Date: Fri, 29 Apr 2016 00:43:41 +0200 Message-ID: <4271094.ei7kj5zJxn@wuerfel> References: <1459894127-17698-1-git-send-email-ynorov@caviumnetworks.com> <2760348.qmm1L3yQch@wuerfel> <20160428222137.GB18227@yury-N73SV> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: In-Reply-To: <20160428222137.GB18227@yury-N73SV> Sender: linux-doc-owner@vger.kernel.org To: Yury Norov Cc: Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, pinskia@gmail.com, Prasun.Kapoor@caviumnetworks.com, schwab@suse.de, broonie@kernel.org, linux-doc@vger.kernel.org, heiko.carstens@de.ibm.com, agraf@suse.de, klimov.linux@gmail.com, Andrew Pinski , bamvor.zhangjian@huawei.com, Andrew Pinski , schwidefsky@de.ibm.com, Nathan_Lynch@mentor.com, joseph@codesourcery.com, christoph.muellner@theobroma-systems.com List-Id: linux-arch.vger.kernel.org On Friday 29 April 2016 01:21:37 Yury Norov wrote: > index 1458ad7..410d817 100644 > --- a/arch/arm64/kernel/sys_ilp32.c > +++ b/arch/arm64/kernel/sys_ilp32.c > @@ -17,6 +17,8 @@ > * along with this program. If not, see > * . > */ > > +#define __SYSCALL_COMPAT > + > #include > #include > #include > @@ -48,13 +50,12 @@ asmlinkage long > ilp32_sys_rt_sigreturn_wrapper(void); > > #include > > -#undef __SYSCALL > -#undef __SC_COMP > -#undef __SC_WRAP > -#undef __SC_3264 > -#undef __SC_COMP_3264 > > -#define __SYSCALL_COMPAT > #define __SYSCALL(nr, sym) [nr] = sym, > #define __SC_WRAP(nr, sym) [nr] = compat_##sym, > > This patch makes gcc warn about redefinition. > > arch/arm64/kernel/sys_ilp32.c:59:0: warning: "__SYSCALL" redefined > #define __SYSCALL(nr, sym) [nr] = sym, > ^ > In file included from include/asm-generic/unistd.h:1:0, > Ok, I think I see it now. Can you #undef the two symbols at the end of arch/arm64/include/uapi/asm/unistd.h or possibly include/uapi/asm-generic/unistd.h? Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de ([217.72.192.75]:51341 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750847AbcD1Wow (ORCPT ); Thu, 28 Apr 2016 18:44:52 -0400 From: Arnd Bergmann Subject: Re: [PATCH 20/25] arm64:ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Date: Fri, 29 Apr 2016 00:43:41 +0200 Message-ID: <4271094.ei7kj5zJxn@wuerfel> In-Reply-To: <20160428222137.GB18227@yury-N73SV> References: <1459894127-17698-1-git-send-email-ynorov@caviumnetworks.com> <2760348.qmm1L3yQch@wuerfel> <20160428222137.GB18227@yury-N73SV> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-arch-owner@vger.kernel.org List-ID: To: Yury Norov Cc: Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, pinskia@gmail.com, Prasun.Kapoor@caviumnetworks.com, schwab@suse.de, broonie@kernel.org, linux-doc@vger.kernel.org, heiko.carstens@de.ibm.com, agraf@suse.de, klimov.linux@gmail.com, Andrew Pinski , bamvor.zhangjian@huawei.com, Andrew Pinski , schwidefsky@de.ibm.com, Nathan_Lynch@mentor.com, joseph@codesourcery.com, christoph.muellner@theobroma-systems.com Message-ID: <20160428224341.NyW6yKsREm8dNyGI0ZwR7m4mrOgVCfGOvLoEF_5OZD0@z> On Friday 29 April 2016 01:21:37 Yury Norov wrote: > index 1458ad7..410d817 100644 > --- a/arch/arm64/kernel/sys_ilp32.c > +++ b/arch/arm64/kernel/sys_ilp32.c > @@ -17,6 +17,8 @@ > * along with this program. If not, see > * . > */ > > +#define __SYSCALL_COMPAT > + > #include > #include > #include > @@ -48,13 +50,12 @@ asmlinkage long > ilp32_sys_rt_sigreturn_wrapper(void); > > #include > > -#undef __SYSCALL > -#undef __SC_COMP > -#undef __SC_WRAP > -#undef __SC_3264 > -#undef __SC_COMP_3264 > > -#define __SYSCALL_COMPAT > #define __SYSCALL(nr, sym) [nr] = sym, > #define __SC_WRAP(nr, sym) [nr] = compat_##sym, > > This patch makes gcc warn about redefinition. > > arch/arm64/kernel/sys_ilp32.c:59:0: warning: "__SYSCALL" redefined > #define __SYSCALL(nr, sym) [nr] = sym, > ^ > In file included from include/asm-generic/unistd.h:1:0, > Ok, I think I see it now. Can you #undef the two symbols at the end of arch/arm64/include/uapi/asm/unistd.h or possibly include/uapi/asm-generic/unistd.h? Arnd