diff options
author | Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> | 2018-01-05 03:47:44 +0100 |
---|---|---|
committer | Jesper Nilsson <jesper@jni.nu> | 2018-01-13 22:42:09 +0100 |
commit | fd989db807a00d552ebf29d8ffb20c2ef04742da (patch) | |
tree | 3572aae733674dc76e54375b4dde22425e9923ea /arch/cris/kernel | |
parent | Linux 4.14 (diff) | |
download | linux-fd989db807a00d552ebf29d8ffb20c2ef04742da.tar.xz 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/kernel')
-rw-r--r-- | arch/cris/kernel/setup.c | 2 |
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, }; |