Kees Cook <keescook@xxxxxxxxxxxx> writes:
> 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@xxxxxxxxxxxx>
> ---
> arch/powerpc/kernel/vmlinux.lds.S | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
cheers
> diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
> index a3c8492b2b19..e184a63aa5b0 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
> --
> 2.17.1
