diff options
| author | Ian Campbell <ijc@hellion.org.uk> | 2008-01-30 13:33:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:38 +0100 |
| commit | 20514e9f6e6221884afada04fbbbde651d3d8654 (patch) | |
| tree | 2b857f95befdcaf69ca28ebd5f783a77ae90badb /arch/x86/boot/compressed | |
| parent | 004426eb295b5fff53ed606d5f7495f23674f2c8 (diff) | |
| download | linux-20514e9f6e6221884afada04fbbbde651d3d8654.tar.gz | |
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>
Diffstat (limited to 'arch/x86/boot/compressed')
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux_32.lds | 4 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux_32.scr | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux_64.lds | 8 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux_64.scr | 2 |
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) |