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=unavailable 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 1AAABC32753 for ; Wed, 14 Aug 2019 02:34:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8B5D20842 for ; Wed, 14 Aug 2019 02:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565750041; bh=k8yonzpNdAgceiEG578aqiAgYJnAWLHIoNXeqkcJjYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Xl9m1dneUVMkyGQwkRKS7pOh0yuczi3QFCzMqi8DrYHx7FfmNHQQXOytMEXu2El81 PtpJSppaogXRrlBEqeVObreqLbI4M/BBntPHUfM8MT0PzST6k4oviKZlC4zWjm7NxQ 79i7txi+pdKHIMuI0AVyOLPj7zxa2xAyRNwvdiJI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728583AbfHNCOI (ORCPT ); Tue, 13 Aug 2019 22:14:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:46136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728571AbfHNCOI (ORCPT ); Tue, 13 Aug 2019 22:14:08 -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 5293E20842; Wed, 14 Aug 2019 02:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565748847; bh=k8yonzpNdAgceiEG578aqiAgYJnAWLHIoNXeqkcJjYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lWwOWYKLoOIQqHrC0N7cDCGqRgfkkYQwIY5cbfktJgnlrQv4L58LabknSSPci63gX aS6TvioRz530yDMXJl/4t853igm31JnVdsfae7LipVTL1LuKyrZ5FGUPjSo+Gqsq6k lU/YkkibZFooiY1lmQvcQWv04INd/ERzwtWtJdqs= 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 5.2 099/123] s390: put _stext and _etext into .text section Date: Tue, 13 Aug 2019 22:10:23 -0400 Message-Id: <20190814021047.14828-99-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021047.14828-1-sashal@kernel.org> References: <20190814021047.14828-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 49d55327de0bc..7e0eb40209177 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -32,10 +32,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 @@ -47,11 +46,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