From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Date: Fri, 5 Jan 2018 02:47:44 +0000 (+0900)
Subject: cris: Fix conflicting types for _etext, _edata, _end
X-Git-Tag: v5.15~9435^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd989db807a00d552ebf29d8ffb20c2ef04742da;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
index 524d475..1b61a72 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, };