linux-kernel - Re: [PATCH] openrisc: Fix conflicting types for _exext and

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20171213145342.GA21872@lianli.shorne-pla.net>
Date:   Wed, 13 Dec 2017 23:53:42 +0900
From:   Stafford Horne <shorne@...il.com>
To:     Sergey Senozhatsky <sergey.senozhatsky.work@...il.com>
Cc:     Joel Stanley <joel@....id.au>, Jonas Bonn <jonas@...thpole.se>,
        Stefan Kristiansson <stefan.kristiansson@...nalahti.fi>,
        openrisc@...ts.librecores.org, linux-kernel@...r.kernel.org,
        Petr Mladek <pmladek@...e.com>
Subject: Re: [PATCH] openrisc: Fix conflicting types for _exext and _stext

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 <joel@....id.au>
> 
> FWIW, looks good to me,
> Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@...il.com>

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 <asm/io.h>
> >  #include <asm/pgtable.h>
> >  #include <asm/unwinder.h>
> > -
> > -extern char _etext, _stext;
> > +#include <asm/sections.h>
> >  
> >  int kstack_depth_to_print = 0x180;
> >  int lwa_flag;
> > -- 
> > 2.14.1
> >