Received: by 10.223.185.116 with SMTP id b49csp1133648wrg; Fri, 23 Feb 2018 12:31:36 -0800 (PST) X-Google-Smtp-Source: AH8x226pMRK9FeBY3wP0CvDH1pCu26kP9pRquIWhgmbNK5LxBOxvvw+9OFnj8hGRlf5Eux36XaTC X-Received: by 2002:a17:902:d20a:: with SMTP id t10-v6mr2810140ply.257.1519417896407; Fri, 23 Feb 2018 12:31:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519417896; cv=none; d=google.com; s=arc-20160816; b=s0QschiIWIpymOUaAgtdlR5RaEKYRO9EADHH/LmAOj9ujCm+Z4VOLz1qZH7yr46hUB 8dEEYDJYdCvMyFtNmMSQAJ7tvepzF5m5xAl3v6rrYrCMB0Jy7L0Phn3n3pwVby6uAu7W mUG8cKmwb1EXKysQOMgLM0BHhrSnJdeGWnxJAoKHJqRMBPoGqBxqzHre7FhUzccExiyV Y6GkjRqksH3Cvl4yOt9LBXsWu+0gMJpvvhCEb0ou6iyQp011f5tUaZMbM1j+uf1a0Ih7 3WM2lbZnhguElKb+rd5p8cIH7jJDNZOshF6kuSwUb34Y38nqK9CPK+WXsGsIfcoGTdUL mAwg== 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=13sVStWPVj7BIupz6o9FmSL7aGpd/e9/V63LeDE66xw=; b=HtjrSiCABdGndzlmmF5EeKim/KaOK0ZrZmG9MRPzY/Oca0zl47RPU00QXF+mB+m6as CGFe/CsFNfYRHd5bRxCGd2txpdFt1bZroPgmLtwnzm9R2a57sJx7EdrhJMDLnaBrjGpj QczTnPFgiygmN7gX2fh18bHmlTAmF9KtBRwNGZ+/o9jUu2BtyaCPriE6X5P3MfrAZTZW lBL5DnG3SIWJ5JbHxlGAljF4MBJnZtvBHitT/pOBU8trd8sHr+OFaLRqq4LUdg8tFH6n hYXqggMXnW2xkL3FW/5tTbCraF9HBeih+0nJ91P0nIFYm9QVlQ4bBDFTZJCTo2T42wAx 3zjA== 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 m27si2296309pfg.64.2018.02.23.12.31.21; Fri, 23 Feb 2018 12:31:36 -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 S1754018AbeBWSgT (ORCPT + 99 others); Fri, 23 Feb 2018 13:36:19 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37628 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754007AbeBWSgR (ORCPT ); Fri, 23 Feb 2018 13:36:17 -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 320CF12E1; Fri, 23 Feb 2018 18:36:17 +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.4 042/193] m68k: add missing SOFTIRQENTRY_TEXT linker section Date: Fri, 23 Feb 2018 19:24:35 +0100 Message-Id: <20180223170332.640722819@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@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.4-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 @@ -44,6 +44,8 @@ SECTIONS { .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT LOCK_TEXT *(.fixup) --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds @@ -15,6 +15,8 @@ SECTIONS .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT LOCK_TEXT *(.fixup) --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds @@ -15,6 +15,8 @@ SECTIONS .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)