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

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

ia64: Rename PT_LOAD identifier "code" to "text"

In preparation for moving NOTES into RO_DATA, rename the linker script
internal identifier for the PT_LOAD Program Header from "code" to "text"
to match other architectures.

Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Fenghua Yu <[email protected]>
Cc: Heiko Carstens <[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: Tony Luck <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: x86-ml <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
 arch/ia64/kernel/vmlinux.lds.S | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index d9d4e21..2c4f23c 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -13,7 +13,7 @@ ENTRY(phys_start)
 jiffies = jiffies_64;
 
 PHDRS {
-       code   PT_LOAD;
+       text   PT_LOAD;
        percpu PT_LOAD;
        data   PT_LOAD;
        note   PT_NOTE;
@@ -36,7 +36,7 @@ SECTIONS {
        phys_start = _start - LOAD_OFFSET;
 
        code : {
-       } :code
+       } :text
        . = KERNEL_START;
 
        _text = .;
@@ -68,9 +68,9 @@ SECTIONS {
        /*
         * Read-only data
         */
-       NOTES :code :note       /* put .notes in text and mark in PT_NOTE  */
+       NOTES :text :note       /* put .notes in text and mark in PT_NOTE  */
        code_continues : {
-       } : code               /* switch back to regular program...  */
+       } :text                /* switch back to regular program...  */
 
        EXCEPTION_TABLE(16)
 
@@ -102,9 +102,9 @@ SECTIONS {
                __start_unwind = .;
                *(.IA_64.unwind*)
                __end_unwind = .;
-       } :code :unwind
+       } :text :unwind
        code_continues2 : {
-       } : code
+       } :text
 
        RODATA
 
@@ -214,7 +214,7 @@ SECTIONS {
        _end = .;
 
        code : {
-       } :code
+       } :text
 
        STABS_DEBUG
        DWARF_DEBUG

Reply via email to