From fd989db807a00d552ebf29d8ffb20c2ef04742da Mon Sep 17 00:00:00 2001 From: Sergey Senozhatsky Date: Fri, 5 Jan 2018 11:47:44 +0900 Subject: 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 Signed-off-by: Jesper Nilsson --- arch/cris/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/cris/kernel') 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 #include #include +#include /* * 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, }; -- cgit v1.2.3 From 6e0377212c4e45d7350cff018f6a95633937c031 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Tue, 6 Feb 2018 12:49:58 +0100 Subject: CRIS: Restore mistakenly cleared kernel Makefile Commit 0fbc0b67a89d7 ("cris: remove arch specific early DT functions") was a bit overzealous in removing the CRIS DT handling, and the complete contents of the Makefile was erased instead of just the line for the devicetree file. This lead to a complete link failure for all SoCs in the CRIS port due to missing symbols. Restore the contents except the line for the devicetree file. Signed-off-by: Jesper Nilsson Fixes: 0fbc0b67a89d7 --- arch/cris/kernel/Makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'arch/cris/kernel') diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile index e69de29bb2d1..f6bfee6c8c1b 100644 --- a/arch/cris/kernel/Makefile +++ b/arch/cris/kernel/Makefile @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the CRIS port. +# + +CPPFLAGS_vmlinux.lds := -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) +extra-y := vmlinux.lds + +obj-y := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o +obj-y += stacktrace.o + +obj-$(CONFIG_MODULES) += crisksyms.o +obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_SYSTEM_PROFILER) += profile.o + +clean: + -- cgit v1.2.3