From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB51FC433FF for ; Wed, 14 Aug 2019 02:17:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 895F420843 for ; Wed, 14 Aug 2019 02:17:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749036; bh=JZeOdsZ1pDG9kYueDJ17W6IlCvFkm0I3PGmHHUVd1uU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AjEAyv6qa+Fzd+1YiSmwrYQmkucynCptogXUXPORO4MiVYwRaagP3ASqq0qHyCUph xaFsGUo6hpK3HEY7VPt4wKgUzTXSXPFBSi88mBgPEmCvMshKSl4wHgK7aMAcCwGDdg iTtBw5R/uWQAAKIx0fi8YEef8s3RiRwV8cZbOi1A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729336AbfHNCRP (ORCPT ); Tue, 13 Aug 2019 22:17:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:48602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729328AbfHNCRP (ORCPT ); Tue, 13 Aug 2019 22:17:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8E91B208C2; Wed, 14 Aug 2019 02:17:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749034; bh=JZeOdsZ1pDG9kYueDJ17W6IlCvFkm0I3PGmHHUVd1uU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qh2wFkIu/cHv8i9Txx9+s/AzNzzRDoIx2+1VAF2JjQWinu9tBT7fzep5JGJNtl/Nz VvAlVqQ02ZkfDWpc3X7/8s9yINArsm58ePGTHI/MxKG0A22yrcNYmkGW0k0fqHswmJ 8XHBXmOsDqQWAAIDpnlqkv3QeZtodfltEloViW60= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vasily Gorbik , Thomas Richter , Andreas Krebbel , Sasha Levin , linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 50/68] s390: put _stext and _etext into .text section Date: Tue, 13 Aug 2019 22:15:28 -0400 Message-Id: <20190814021548.16001-50-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021548.16001-1-sashal@kernel.org> References: <20190814021548.16001-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vasily Gorbik [ Upstream commit 24350fdadbdec780406a1ef988e6cd3875e374a8 ] Perf relies on _etext and _stext symbols being one of 't', 'T', 'v' or 'V'. Put them into .text section to guarantee that. Also moves padding to page boundary inside .text which has an effect that .text section is now padded with nops rather than 0's, which apparently has been the initial intention for specifying 0x0700 fill expression. Reported-by: Thomas Richter Tested-by: Thomas Richter Suggested-by: Andreas Krebbel Signed-off-by: Vasily Gorbik Signed-off-by: Sasha Levin --- arch/s390/kernel/vmlinux.lds.S | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index b43f8d33a3697..18ede6e806b91 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -31,10 +31,9 @@ PHDRS { SECTIONS { . = 0x100000; - _stext = .; /* Start of text section */ .text : { - /* Text and read-only data */ - _text = .; + _stext = .; /* Start of text section */ + _text = .; /* Text and read-only data */ HEAD_TEXT TEXT_TEXT SCHED_TEXT @@ -46,11 +45,10 @@ SECTIONS *(.text.*_indirect_*) *(.fixup) *(.gnu.warning) + . = ALIGN(PAGE_SIZE); + _etext = .; /* End of text section */ } :text = 0x0700 - . = ALIGN(PAGE_SIZE); - _etext = .; /* End of text section */ - NOTES :text :note .dummy : { *(.dummy) } :data -- 2.20.1