* [tip: x86/build] alpha: Rename PT_LOAD identifier "kernel" to "text"
[not found] <20191029211351.13243-5-keescook@chromium.org>
@ 2019-11-05 9:27 ` tip-bot2 for Kees Cook
0 siblings, 0 replies; only message in thread
From: tip-bot2 for Kees Cook @ 2019-11-05 9:27 UTC (permalink / raw)
To: linux-tip-commits
Cc: Kees Cook, Borislav Petkov, Andy Lutomirski, Arnd Bergmann,
Dave Hansen, Heiko Carstens, Ivan Kokshaysky, linux-alpha,
linux-arch, linux-arm-kernel, linux-c6x-dev, linux-ia64,
linuxppc-dev, linux-s390, Matt Turner, Michael Ellerman,
Michal Simek, Richard Henderson, Rick Edgecombe,
Segher Boessenkool, Will Deacon, x86-ml, Yoshinori Sato,
Ingo Molnar, Borislav Petkov, linux-kernel
The following commit has been merged into the x86/build branch of tip:
Commit-ID: 65182e6e36195fbf9340808ac4a00d1c146bc05c
Gitweb: https://git.kernel.org/tip/65182e6e36195fbf9340808ac4a00d1c146bc05c
Author: Kees Cook <keescook@chromium.org>
AuthorDate: Tue, 29 Oct 2019 14:13:26 -07:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 04 Nov 2019 15:34:17 +01:00
alpha: Rename PT_LOAD identifier "kernel" to "text"
In preparation for moving NOTES into RO_DATA, rename the linker script
internal identifier for the PT_LOAD Program Header from "kernel" to
"text" to match other architectures.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-ia64@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s390@vger.kernel.org
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Rick Edgecombe <rick.p.edgecombe@intel.com>
Cc: Segher Boessenkool <segher@kernel.crashing.org>
Cc: Will Deacon <will@kernel.org>
Cc: x86-ml <x86@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: https://lkml.kernel.org/r/20191029211351.13243-5-keescook@chromium.org
---
arch/alpha/kernel/vmlinux.lds.S | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index c4b5cec..781090c 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -8,7 +8,7 @@
OUTPUT_FORMAT("elf64-alpha")
OUTPUT_ARCH(alpha)
ENTRY(__start)
-PHDRS { kernel PT_LOAD; note PT_NOTE; }
+PHDRS { text PT_LOAD; note PT_NOTE; }
jiffies = jiffies_64;
SECTIONS
{
@@ -27,14 +27,14 @@ SECTIONS
LOCK_TEXT
*(.fixup)
*(.gnu.warning)
- } :kernel
+ } :text
swapper_pg_dir = SWAPPER_PGD;
_etext = .; /* End of text section */
- NOTES :kernel :note
+ NOTES :text :note
.dummy : {
*(.dummy)
- } :kernel
+ } :text
RODATA
EXCEPTION_TABLE(16)
^ permalink raw reply [flat|nested] only message in thread