diff options
author | Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> | 2018-01-04 21:47:44 -0500 |
---|---|---|
committer | Jesper Nilsson <jesper@jni.nu> | 2018-01-13 16:42:09 -0500 |
commit | fd989db807a00d552ebf29d8ffb20c2ef04742da (patch) | |
tree | 3572aae733674dc76e54375b4dde22425e9923ea | |
parent | bebc6082da0a9f5d47a1ea2edc099bf671058bd4 (diff) |
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>
-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 @@ | |||
24 | #include <linux/of_fdt.h> | 24 | #include <linux/of_fdt.h> |
25 | #include <asm/setup.h> | 25 | #include <asm/setup.h> |
26 | #include <arch/system.h> | 26 | #include <arch/system.h> |
27 | #include <asm/sections.h> | ||
27 | 28 | ||
28 | /* | 29 | /* |
29 | * Setup options | 30 | * Setup options |
@@ -31,7 +32,6 @@ | |||
31 | struct screen_info screen_info; | 32 | struct screen_info screen_info; |
32 | 33 | ||
33 | extern int root_mountflags; | 34 | extern int root_mountflags; |
34 | extern char _etext, _edata, _end; | ||
35 | 35 | ||
36 | char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, }; | 36 | char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, }; |
37 | 37 | ||