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 <ijc@hellion.org.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

4 files changed, 10 insertions, 6 deletions

diff --git a/arch/x86/boot/compressed/vmlinux_32.lds b/arch/x86/boot/compressed/vmlinux_32.lds
index d98ab69a1276..bb3c48379c40 100644
--- 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 a54952661995..f02382ae5c48 100644
--- 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 8d63b3a22ce4..f6e5b445f457 100644
--- 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 bd1429ce193e..f02382ae5c48 100644
--- 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)