Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6-omap-h63xx.git] / arch / x86 / boot / compressed / vmlinux_64.lds

diff --git a/arch/x86/boot/compressed/vmlinux_64.lds b/arch/x86/boot/compressed/vmlinux_64.lds
index 94c13e557fb4f057a620ef319367d623a08e9f88..bef1ac891bce9987d2693cdc1ff601457af0d6c4 100644 (file)
--- a/arch/x86/boot/compressed/vmlinux_64.lds
+++ b/arch/x86/boot/compressed/vmlinux_64.lds
@@ -3,15 +3,19 @@ OUTPUT_ARCH(i386:x86-64)
 ENTRY(startup_64)
 SECTIONS
 {
-       /* Be careful parts of head.S assume startup_32 is at
-        * address 0.
+       /* Be careful parts of head_64.S assume startup_32 is at
+        * address 0.
         */
        . = 0;
-       .text : {
+       .text.head : {
                _head = . ;
                *(.text.head)
                _ehead = . ;
-               *(.text.compressed)
+       }
+       .rodata.compressed : {
+               *(.rodata.compressed)
+       }
+       .text : {
                _text = .;      /* Text */
                *(.text)
                *(.text.*)
@@ -35,10 +39,10 @@ SECTIONS
                *(.bss.*)
                *(COMMON)
                . = ALIGN(8);
-               _end = . ;
+               _end_before_pgt = . ;
                . = ALIGN(4096);
                pgtable = . ;
                . = . + 4096 * 6;
-               _heap = .;
+               _ebss = .;
        }
 }