Skip to content

Commit ce666d9

Browse files
shenkipmladek
authored andcommitted
openrisc: Fix conflicting types for _exext and _stext
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 <[email protected]> Reviewed-by: Sergey Senozhatsky <[email protected]> Acked-by: Stafford Horne <[email protected]> Signed-off-by: Petr Mladek <[email protected]>
1 parent 25493e5 commit ce666d9

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/openrisc/kernel/traps.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
#include <asm/io.h>
4040
#include <asm/pgtable.h>
4141
#include <asm/unwinder.h>
42-
43-
extern char _etext, _stext;
42+
#include <asm/sections.h>
4443

4544
int kstack_depth_to_print = 0x180;
4645
int lwa_flag;

0 commit comments

Comments
 (0)