summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorSergey Senozhatsky <sergey.senozhatsky.work@gmail.com>2018-01-05 11:47:44 +0900
committerJesper Nilsson <jesper@jni.nu>2018-01-13 22:42:09 +0100
commitfd989db807a00d552ebf29d8ffb20c2ef04742da (patch)
tree3572aae733674dc76e54375b4dde22425e9923ea /arch/cris
parentbebc6082da0a9f5d47a1ea2edc099bf671058bd4 (diff)
downloadlinux-fd989db807a00d552ebf29d8ffb20c2ef04742da.tar.gz
linux-fd989db807a00d552ebf29d8ffb20c2ef04742da.tar.bz2
linux-fd989db807a00d552ebf29d8ffb20c2ef04742da.zip
cris: Fix conflicting types for _etext, _edata, _end
Include asm/sections.h header which contains the correct types for _etext, _edata and _end - char arrays. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
index 524d47501a23..1b61a7207afb 100644
--- a/arch/cris/kernel/setup.c
+++ b/arch/cris/kernel/setup.c
@@ -24,6 +24,7 @@
#include <linux/of_fdt.h>
#include <asm/setup.h>
#include <arch/system.h>
+#include <asm/sections.h>
/*
* Setup options
@@ -31,7 +32,6 @@
struct screen_info screen_info;
extern int root_mountflags;
-extern char _etext, _edata, _end;
char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, };