mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
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]>
This commit is contained in:
1 parent
25493e5fba
commit
ce666d917b
1 file changed
+1
-2
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user