diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
| commit | c7a441bba9de3b4e166b6a4449208bc906d70558 (patch) | |
| tree | 346fdf11e464c8201a9aaa8abdd1c1b6dc4f86e0 /arch/x86/boot | |
| parent | ead54d878465291746c91c95749990d62742a6cf (diff) | |
| parent | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (diff) | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/compressed/mkpiggy.c | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux.lds.S | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/boot/compressed/mkpiggy.c b/arch/x86/boot/compressed/mkpiggy.c index bcbd36c4143..5c228129d17 100644 --- a/arch/x86/boot/compressed/mkpiggy.c +++ b/arch/x86/boot/compressed/mkpiggy.c @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) offs += 32*1024 + 18; /* Add 32K + 18 bytes slack */ offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ - printf(".section \".rodata.compressed\",\"a\",@progbits\n"); + printf(".section \".rodata..compressed\",\"a\",@progbits\n"); printf(".globl z_input_len\n"); printf("z_input_len = %lu\n", ilen); printf(".globl z_output_len\n"); diff --git a/arch/x86/boot/compressed/vmlinux.lds.S b/arch/x86/boot/compressed/vmlinux.lds.S index a6f1a59a5b0..5ddabceee12 100644 --- a/arch/x86/boot/compressed/vmlinux.lds.S +++ b/arch/x86/boot/compressed/vmlinux.lds.S @@ -26,8 +26,8 @@ SECTIONS HEAD_TEXT _ehead = . ; } - .rodata.compressed : { - *(.rodata.compressed) + .rodata..compressed : { + *(.rodata..compressed) } .text : { _text = .; /* Text */ |