diff --git a/[refs] b/[refs] index 783fddfb482c..a3c30f4aa966 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 004426eb295b5fff53ed606d5f7495f23674f2c8 +refs/heads/master: 20514e9f6e6221884afada04fbbbde651d3d8654 diff --git a/trunk/arch/x86/boot/compressed/vmlinux_32.lds b/trunk/arch/x86/boot/compressed/vmlinux_32.lds index d98ab69a1276..bb3c48379c40 100644 --- a/trunk/arch/x86/boot/compressed/vmlinux_32.lds +++ b/trunk/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/trunk/arch/x86/boot/compressed/vmlinux_32.scr b/trunk/arch/x86/boot/compressed/vmlinux_32.scr index a54952661995..f02382ae5c48 100644 --- a/trunk/arch/x86/boot/compressed/vmlinux_32.scr +++ b/trunk/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/trunk/arch/x86/boot/compressed/vmlinux_64.lds b/trunk/arch/x86/boot/compressed/vmlinux_64.lds index 8d63b3a22ce4..f6e5b445f457 100644 --- a/trunk/arch/x86/boot/compressed/vmlinux_64.lds +++ b/trunk/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/trunk/arch/x86/boot/compressed/vmlinux_64.scr b/trunk/arch/x86/boot/compressed/vmlinux_64.scr index bd1429ce193e..f02382ae5c48 100644 --- a/trunk/arch/x86/boot/compressed/vmlinux_64.scr +++ b/trunk/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)