Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-07-14 11:33:41 +0200
committerJiri Slaby <jslaby@suse.cz>2019-07-14 11:33:54 +0200
commit6f4841b2ca86cc7105d8e0af49d4d9852d0f36ac (patch)
tree1fd93157123f7711426d3aad6b0b4d6b15c9b98a
parent46402596ab85f892d96da03fd1a4bea1da5e99b8 (diff)
Revert "x86/build: Move _etext to actual end of .text"
-rw-r--r--patches.kernel.org/5.2.1-050-Revert-x86-build-Move-_etext-to-actual-end-of-..patch61
-rw-r--r--series.conf1
2 files changed, 62 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.1-050-Revert-x86-build-Move-_etext-to-actual-end-of-..patch b/patches.kernel.org/5.2.1-050-Revert-x86-build-Move-_etext-to-actual-end-of-..patch
new file mode 100644
index 0000000000..eb357485fb
--- /dev/null
+++ b/patches.kernel.org/5.2.1-050-Revert-x86-build-Move-_etext-to-actual-end-of-..patch
@@ -0,0 +1,61 @@
+From: Ross Zwisler <zwisler@chromium.org>
+Date: Mon, 1 Jul 2019 09:52:08 -0600
+Subject: [PATCH] Revert "x86/build: Move _etext to actual end of .text"
+References: bnc#1012628
+Patch-mainline: 5.2.1
+Git-commit: 013c66edf207ddb78422b8b636f56c87939c9e34
+
+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 <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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ 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
+
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index 16051340d1..aa9171555f 100644
--- a/series.conf
+++ b/series.conf
@@ -76,6 +76,7 @@
patches.kernel.org/5.2.1-047-coresight-tmc-etr-alloc_perf_buf-Do-not-call-sm.patch
patches.kernel.org/5.2.1-048-coresight-tmc-etf-Do-not-call-smp_processor_id-.patch
patches.kernel.org/5.2.1-049-carl9170-fix-misuse-of-device-driver-API.patch
+ patches.kernel.org/5.2.1-050-Revert-x86-build-Move-_etext-to-actual-end-of-..patch
########################################################
# Build fixes that apply to the vanilla kernel too.