x86: switch to .rodata.compressed in arch/x86/boot/compressed/vmlinux_??.scr

vmlinux_64 and vmlinux_32.scr are now identical

size shows an expected movement from .text to .rodata and 4 extra bytes
of padding.

Signed-off-by: Ian Campbell <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/arch/x86/boot/compressed/vmlinux_32.lds b/arch/x86/boot/compressed/vmlinux_32.lds
index d98ab69a1276ef66b2d41e9286c475d902252c0c..bb3c48379c40f858f6ce09d5be215ad192524ed4 100644 (file)
--- a/arch/x86/boot/compressed/vmlinux_32.lds
+++ b/arch/x86/boot/compressed/vmlinux_32.lds
@@ -12,8 +12,8 @@ SECTIONS
                *(.text.head)
                _ehead = . ;
        }
-       .data.compressed : {
-               *(.data.compressed)
+       .rodata.compressed : {
+               *(.rodata.compressed)
        }
        .text : {
                _text = .;      /* Text */

diff --git a/arch/x86/boot/compressed/vmlinux_32.scr b/arch/x86/boot/compressed/vmlinux_32.scr
index a54952661995951548cdcc6e2ec79eb8a1afcdaf..f02382ae5c48b1cd319a4cb1e755fa060f03cfdc 100644 (file)
--- a/arch/x86/boot/compressed/vmlinux_32.scr
+++ b/arch/x86/boot/compressed/vmlinux_32.scr
@@ -1,6 +1,6 @@
 SECTIONS
 {
-  .data.compressed : {
+  .rodata.compressed : {
        input_len = .;
        LONG(input_data_end - input_data) input_data = .;
        *(.data)

diff --git a/arch/x86/boot/compressed/vmlinux_64.lds b/arch/x86/boot/compressed/vmlinux_64.lds
index 8d63b3a22ce488f2cca49402986fc372caaf57f0..f6e5b445f45734126152819bf0dcb8e9de7acbfb 100644 (file)
--- a/arch/x86/boot/compressed/vmlinux_64.lds
+++ b/arch/x86/boot/compressed/vmlinux_64.lds
@@ -7,11 +7,15 @@ SECTIONS
         * address 0.
         */
        . = 0;
-       .text : {
+       .text.head : {
                _head = . ;
                *(.text.head)
                _ehead = . ;
-               *(.text.compressed)
+       }
+       .rodata.compressed : {
+               *(.rodata.compressed)
+       }
+       .text : {
                _text = .;      /* Text */
                *(.text)
                *(.text.*)

diff --git a/arch/x86/boot/compressed/vmlinux_64.scr b/arch/x86/boot/compressed/vmlinux_64.scr
index bd1429ce193e903b1c1127edcff1b32371dfabfe..f02382ae5c48b1cd319a4cb1e755fa060f03cfdc 100644 (file)
--- a/arch/x86/boot/compressed/vmlinux_64.scr
+++ b/arch/x86/boot/compressed/vmlinux_64.scr
@@ -1,6 +1,6 @@
 SECTIONS
 {
-  .text.compressed : {
+  .rodata.compressed : {
        input_len = .;
        LONG(input_data_end - input_data) input_data = .;
        *(.data)