Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753297AbdLMOxr (ORCPT ); Wed, 13 Dec 2017 09:53:47 -0500 Received: from mail-pl0-f66.google.com ([209.85.160.66]:46093 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752984AbdLMOxp (ORCPT ); Wed, 13 Dec 2017 09:53:45 -0500 X-Google-Smtp-Source: ACJfBouYNUmGT3m3w8ZbjzdSKRzXwp3oQJ0ja68aTlpYJ5TfzoZSYVYLBgJ2phJDXNyybXVurnNOjA== Date: Wed, 13 Dec 2017 23:53:42 +0900 From: Stafford Horne To: Sergey Senozhatsky Cc: Joel Stanley , Jonas Bonn , Stefan Kristiansson , openrisc@lists.librecores.org, linux-kernel@vger.kernel.org, Petr Mladek Subject: Re: [PATCH] openrisc: Fix conflicting types for _exext and _stext Message-ID: <20171213145342.GA21872@lianli.shorne-pla.net> References: <20171213034212.25910-1-joel@jms.id.au> <20171213061544.GA738@jagdpanzerIV> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20171213061544.GA738@jagdpanzerIV> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1901 Lines: 58 On Wed, Dec 13, 2017 at 03:15:44PM +0900, Sergey Senozhatsky wrote: > On (12/13/17 14:12), Joel Stanley wrote: > > The printk tree in linux-next has a patch "symbol lookup: introduce > > dereference_symbol_descriptor()" that includes sections.h in kallsyms.h, > > so arch/openrisc/kernel/traps.c gets a second extern definition for > > _etext and _stext. > > > > Remove the local definitions and include sections.h directly in > > preparation for the kallsyms.h change. > > > > This fixes the following (future) build error: > > > > CC arch/openrisc/kernel/traps.o > > arch/openrisc/kernel/traps.c:43:13: error: conflicting types for ‘_etext’ > > extern char _etext, _stext; > > ^ Oh man, why would this have been like this? > > In file included from ./arch/openrisc/include/generated/asm/sections.h:1:0, > > from ./include/linux/kallsyms.h:15, > > from arch/openrisc/kernel/traps.c:35: > > ./include/asm-generic/sections.h:35:32: note: previous declaration of ‘_etext’ was here > > extern char _text[], _stext[], _etext[]; > > ^ > > > > Signed-off-by: Joel Stanley > > FWIW, looks good to me, > Reviewed-by: Sergey Senozhatsky Thanks. Applied for 4.16. -Stafford > -ss > > > --- > > arch/openrisc/kernel/traps.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c > > index 4085d72fa5ae..5fb6d512502d 100644 > > --- a/arch/openrisc/kernel/traps.c > > +++ b/arch/openrisc/kernel/traps.c > > @@ -39,8 +39,7 @@ > > #include > > #include > > #include > > - > > -extern char _etext, _stext; > > +#include > > > > int kstack_depth_to_print = 0x180; > > int lwa_flag; > > -- > > 2.14.1 > >