The following commit has been merged into the x86/build branch of tip:

Commit-ID:     af0f3e9e205c3d1bad91ad83e06bfd04df9712b2
Gitweb:        
https://git.kernel.org/tip/af0f3e9e205c3d1bad91ad83e06bfd04df9712b2
Author:        Kees Cook <[email protected]>
AuthorDate:    Tue, 29 Oct 2019 14:13:25 -07:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Mon, 04 Nov 2019 15:34:11 +01:00

powerpc: 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 <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Acked-by: Michael Ellerman <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: Michael Ellerman <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Rick Edgecombe <[email protected]>
Cc: Segher Boessenkool <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: [email protected]
Cc: Yoshinori Sato <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
 arch/powerpc/kernel/vmlinux.lds.S | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/kernel/vmlinux.lds.S 
b/arch/powerpc/kernel/vmlinux.lds.S
index a3c8492..e184a63 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -18,7 +18,7 @@
 ENTRY(_stext)
 
 PHDRS {
-       kernel PT_LOAD FLAGS(7); /* RWX */
+       text PT_LOAD FLAGS(7); /* RWX */
        note PT_NOTE FLAGS(0);
 }
 
@@ -63,7 +63,7 @@ SECTIONS
 #else /* !CONFIG_PPC64 */
                HEAD_TEXT
 #endif
-       } :kernel
+       } :text
 
        __head_end = .;
 
@@ -112,7 +112,7 @@ SECTIONS
                __got2_end = .;
 #endif /* CONFIG_PPC32 */
 
-       } :kernel
+       } :text
 
        . = ALIGN(ETEXT_ALIGN_SIZE);
        _etext = .;
@@ -163,9 +163,9 @@ SECTIONS
 #endif
        EXCEPTION_TABLE(0)
 
-       NOTES :kernel :note
+       NOTES :text :note
        /* Restore program header away from PT_NOTE. */
-       .dummy : { *(.dummy) } :kernel
+       .dummy : { *(.dummy) } :text
 
 /*
  * Init sections discarded at runtime
@@ -180,7 +180,7 @@ SECTIONS
 #ifdef CONFIG_PPC64
                *(.tramp.ftrace.init);
 #endif
-       } :kernel
+       } :text
 
        /* .exit.text is discarded at runtime, not link time,
         * to deal with references from __bug_table

Reply via email to