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;
Date:   Tue, 9 Jul 2019 05:03:34 -0700
From:   tip-bot for Ross Zwisler <tipbot@zytor.com>
Message-ID: <tip-013c66edf207ddb78422b8b636f56c87939c9e34@git.kernel.org>
Cc:     zwisler@google.com, zwisler@chromium.org,
        johannes.hirte@datenkhaos.de, tglx@linutronix.de, bp@alien8.de,
        hpa@zytor.com, groeck@google.com, stable@vger.kernel.org,
        mingo@kernel.org, linux-kernel@vger.kernel.org,
        keescook@chromium.org, klaus.kusche@computerix.info,
        groeck@chromium.org
Reply-To: linux-kernel@vger.kernel.org, keescook@chromium.org,
          groeck@google.com, stable@vger.kernel.org, mingo@kernel.org,
          groeck@chromium.org, klaus.kusche@computerix.info,
          zwisler@google.com, tglx@linutronix.de,
          johannes.hirte@datenkhaos.de, zwisler@chromium.org, bp@alien8.de,
          hpa@zytor.com
In-Reply-To: <20190701155208.211815-1-zwisler@google.com>
References: <20190701155208.211815-1-zwisler@google.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/urgent] Revert "x86/build: Move _etext to actual end of
 .text"
Git-Commit-ID: 013c66edf207ddb78422b8b636f56c87939c9e34
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  013c66edf207ddb78422b8b636f56c87939c9e34
Gitweb:     https://git.kernel.org/tip/013c66edf207ddb78422b8b636f56c87939c9e34
Author:     Ross Zwisler <zwisler@chromium.org>
AuthorDate: Mon, 1 Jul 2019 09:52:08 -0600
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 9 Jul 2019 13:57:31 +0200

Revert "x86/build: Move _etext to actual end of .text"

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 <zwisler@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Cc: <stable@vger.kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Johannes Hirte <johannes.hirte@datenkhaos.de>
Cc: Klaus Kusche <klaus.kusche@computerix.info>
Cc: samitolvanen@google.com
Cc: Guenter Roeck <groeck@google.com>
Link: https://lkml.kernel.org/r/20190701155208.211815-1-zwisler@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/vmlinux.lds.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 0850b5149345..4d1517022a14 100644
--- 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