Merge tags 'cris-for-4.16' and 'cris-for-4.16-urgent' of... (977e4152) · Commits · 戴 / test

Merge tags 'cris-for-4.16' and 'cris-for-4.16-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris Pull CRIS updates and fixes from Jesper Nilsson: - a small fix for some conflicting symbols, aligning CRIS with other platforms. - fix build breakage regression for all CRIS SoCs. The main Makefile for the CRIS port was overzealously scrubbed in 4.15-rc3. * tag 'cris-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris: cris: Fix conflicting types for _etext, _edata, _end * tag 'cris-for-4.16-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris: CRIS: Restore mistakenly cleared kernel Makefile

arch/cris/kernel/Makefile

+17 −0

Original line number	Diff line number	Diff line
		# 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:

+1 −1

Original line number	Diff line number	Diff line
		@@ -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, };