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

Signed-off-by: Kees Cook <keesc...@chromium.org>
---
 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 0da58cf8e213..c1067992fcd1 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
 
@@ -224,7 +224,7 @@ SECTIONS {
        _end = .;
 
        code : {
-       } :code
+       } :text
 
        STABS_DEBUG
        DWARF_DEBUG
-- 
2.17.1

Reply via email to