Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10f837e5 authored Dec 06, 2017 by Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu fixes from Greg Ungerer:
 "There are two fixes here. One to add a missing linker section to the
  m68k architecture linker scripts, the other to fix a defconfig build
  problem"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k/defconfig: fix stmark2 broken local compilation
  m68k: add missing SOFTIRQENTRY_TEXT linker section

parents dd53a421 65323ee1

arch/m68k/configs/stmark2_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ CONFIG_SYSVIPC=y
		CONFIG_LOG_BUF_SHIFT=14
		CONFIG_NAMESPACES=y
		CONFIG_BLK_DEV_INITRD=y
		CONFIG_INITRAMFS_SOURCE="../uClinux-dist/romfs"
		# CONFIG_RD_BZIP2 is not set
		# CONFIG_RD_LZMA is not set
		# CONFIG_RD_XZ is not set

arch/m68k/kernel/vmlinux-nommu.lds

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ SECTIONS {
		.text : {
		HEAD_TEXT
		TEXT_TEXT
		IRQENTRY_TEXT
		SOFTIRQENTRY_TEXT
		SCHED_TEXT
		CPUIDLE_TEXT
		LOCK_TEXT

arch/m68k/kernel/vmlinux-std.lds

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ SECTIONS
		.text : {
		HEAD_TEXT
		TEXT_TEXT
		IRQENTRY_TEXT
		SOFTIRQENTRY_TEXT
		SCHED_TEXT
		CPUIDLE_TEXT
		LOCK_TEXT

arch/m68k/kernel/vmlinux-sun3.lds

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ SECTIONS
		.text : {
		HEAD_TEXT
		TEXT_TEXT
		IRQENTRY_TEXT
		SOFTIRQENTRY_TEXT
		SCHED_TEXT
		CPUIDLE_TEXT
		LOCK_TEXT