| Message ID | 20171213034212.25910-1-joel@jms.id.au |
|---|---|
| State | Accepted |
| Commit | ce666d917bc07469022f3bf713b3520b344995ae |
| Headers | show |
| Series | openrisc: Fix conflicting types for _exext and _stext | expand |
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; > ^ > 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@jms.id.au> FWIW, looks good to me, Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> -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 >
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@jms.id.au> > > FWIW, looks good to me, > Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.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 > >
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;
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; ^ 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@jms.id.au> --- arch/openrisc/kernel/traps.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.14.1