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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 B90A7C742BA for ; Fri, 12 Jul 2019 12:35:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C47020645 for ; Fri, 12 Jul 2019 12:35:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934912; bh=TyjZHA5J/rjfmvLhvSpZtxGosN4QLpv8RgvSBHoXeK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AGeBU7cQCg/qaKTVq87NgR7uXAFuCHwkvf9We4PfGrD8a+WZH3r7XFijwZO1HPbqn tysmoBCgrJpzdtkW30qORZvVTcl6RZV16VMhC/j1fsuAPB3JpczL5SIiebQWfjTfpo b9UmKmoKfgbrnyi6bLN4wMD1bG9BV46V1YkjjgM0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729839AbfGLMfI (ORCPT ); Fri, 12 Jul 2019 08:35:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:55328 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729212AbfGLMfB (ORCPT ); Fri, 12 Jul 2019 08:35:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3AEA9216B7; Fri, 12 Jul 2019 12:35:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934900; bh=TyjZHA5J/rjfmvLhvSpZtxGosN4QLpv8RgvSBHoXeK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CoUK+qp+Thxv/rn0U4SUZSkmO9g7qT9uGQGRViZZXSCsorjfdjJYNG3dcjtQZ8tDx xuL8SlzZS/4V9K/UE31YvCv4VKyv2FzI67IdM10MuRjuoailGRauHJd3yJZu2j59qY gBcIXWySFusRkb9uun/EeYfY1cy1XkuTrQmWGmjM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ross Zwisler , Thomas Gleixner , Guenter Roeck , "H. Peter Anvin" , Borislav Petkov , Kees Cook , Johannes Hirte , Klaus Kusche , samitolvanen@google.com, Guenter Roeck , Ingo Molnar Subject: [PATCH 5.2 51/61] Revert "x86/build: Move _etext to actual end of .text" Date: Fri, 12 Jul 2019 14:20:04 +0200 Message-Id: <20190712121623.439584746@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121620.632595223@linuxfoundation.org> References: <20190712121620.632595223@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ross Zwisler commit 013c66edf207ddb78422b8b636f56c87939c9e34 upstream. This reverts commit 392bef709659abea614abfe53cf228e7a59876a4. Per the discussion here: https://lkml.kernel.org/r/201906201042.3BF5CD6@keescook the above referenced commit breaks kernel compilation with old GCC toolchains as well as current versions of the Gold linker. Revert it to fix the regression and to keep the ability to compile the kernel with these tools. Signed-off-by: Ross Zwisler Signed-off-by: Thomas Gleixner Reviewed-by: Guenter Roeck Cc: Cc: "H. Peter Anvin" Cc: Borislav Petkov Cc: Kees Cook Cc: Johannes Hirte Cc: Klaus Kusche Cc: samitolvanen@google.com Cc: Guenter Roeck Link: https://lkml.kernel.org/r/20190701155208.211815-1-zwisler@google.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/vmlinux.lds.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -141,10 +141,10 @@ SECTIONS *(.text.__x86.indirect_thunk) __indirect_thunk_end = .; #endif - } :text = 0x9090 - /* End of text section */ - _etext = .; + /* End of text section */ + _etext = .; + } :text = 0x9090 NOTES :text :note