Received: by 10.223.185.116 with SMTP id b49csp1069824wrg; Fri, 23 Feb 2018 11:21:55 -0800 (PST) X-Google-Smtp-Source: AH8x226SBeqE8/W8zg7fwIUjYYqEw2lz0VAaoyNfCPoDXX7T8CgAEb8Fy+hkE1HsfKBBpL2le1RW X-Received: by 10.98.99.199 with SMTP id x190mr2760643pfb.68.1519413715323; Fri, 23 Feb 2018 11:21:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413715; cv=none; d=google.com; s=arc-20160816; b=r6cMPHC1tICN/niQ5AvZGy1n9KcaDu8lHzkCNadXBZFGFmLdFIzXPxgJILRcfPLmfx 7gPhao7ta/KvIwC9vXyOMgn9MOFtzxTExq0wMRD0Pe+Nnz6FKQKIO043axvPbX10ZqA+ f17RQSQcc5RaMwQcMyfEsVQ7Q5CyUpi1uY37PztogX0KcFn+RYymNJxYA8tQWwSZhVEl Q0nJZyylV0AlNmfo0Qwq+kFP3mx1MeyGTzUcbHG9l4h14QCPwKBkvqF8vXNEaaqby9QO 14qaZVOqnC6AWjucqLOQruJ03sCLouaB1Ke1FgMGdNxaRRsJh45KSAICDHPvnhD+diMj h4Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=gfCAYv0cRJ0oWVij9FVs4X01K0a2fJnHpID/ma84urQ=; b=p6fTHzXcAVWa8UY3loocM7TdSWhSg+DfT67tly5bzaOpwQKsGCEfru1SEusHHVRK++ bhlY+2N/HP2doEpPHTY+U/WMkYA3uTgC9EYqyD1YVWhgAjFGXwbwwiUkX4VHWqV8RH5V NRKNBoZMEvBfZ3NUef2qly23wXbIxJHKAv0HcYaQOtQcrlZIF1xFFjY6YvuhCVyVmJ5M BjFLulQ/QCO82DMHVdEYDJUOB+xEgFh4q0NSkYEKXKena9RHIpIdhqS0fKE/xQestzvP j3BJl42LWCrxo9hWzOcttQHXNbv5+N9wX9AIxDkAMNiX7hoO+dDrZ9xP8g4KW78jo6/y Y2Ug== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h12si1859955pgn.439.2018.02.23.11.21.40; Fri, 23 Feb 2018 11:21:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964909AbeBWSyG (ORCPT + 99 others); Fri, 23 Feb 2018 13:54:06 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47618 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964898AbeBWSyD (ORCPT ); Fri, 23 Feb 2018 13:54:03 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 35C3A1148; Fri, 23 Feb 2018 18:54:03 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Greg Ungerer , Sasha Levin Subject: [PATCH 4.14 104/159] m68k: add missing SOFTIRQENTRY_TEXT linker section Date: Fri, 23 Feb 2018 19:26:52 +0100 Message-Id: <20180223170756.003062677@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Ungerer [ Upstream commit 969de0988b77e5a57aac2f7270191a3c50540c52 ] Commit be7635e7287e ("arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections") added a new linker section, SOFTIRQENTRY_TEXT, to the linker scripts for most architectures. It didn't add it to any of the linker scripts for the m68k architecture. This was not really a problem because it is only defined if either of CONFIG_FUNCTION_GRAPH_TRACER or CONFIG_KASAN are enabled - which can never be true for m68k. However commit 229a71860547 ("irq: Make the irqentry text section unconditional") means that SOFTIRQENTRY_TEXT is now always defined. So on m68k we now end up with a separate ELF section for .softirqentry.text instead of it being part of the .text section. On some m68k targets in some configurations this can also cause a fatal link error: LD vmlinux /usr/local/bin/../m68k-uclinux/bin/ld.real: section .softirqentry.text loaded at [0000000010de10c0,0000000010de12dd] overlaps section .rodata loaded at [0000000010de10c0,0000000010e0fd67] To fix add in the missing SOFTIRQENTRY_TEXT section into the m68k linker scripts. I noticed that m68k is also missing the IRQENTRY_TEXT section, so this patch also adds an entry for that too. Signed-off-by: Greg Ungerer Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/m68k/kernel/vmlinux-nommu.lds | 2 ++ arch/m68k/kernel/vmlinux-std.lds | 2 ++ arch/m68k/kernel/vmlinux-sun3.lds | 2 ++ 3 files changed, 6 insertions(+) --- a/arch/m68k/kernel/vmlinux-nommu.lds +++ b/arch/m68k/kernel/vmlinux-nommu.lds @@ -45,6 +45,8 @@ SECTIONS { .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT CPUIDLE_TEXT LOCK_TEXT --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds @@ -16,6 +16,8 @@ SECTIONS .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT CPUIDLE_TEXT LOCK_TEXT --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds @@ -16,6 +16,8 @@ SECTIONS .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT CPUIDLE_TEXT LOCK_TEXT