Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / s390 / boot / compressed / vmlinux.lds.S

diff --git a/arch/s390/boot/compressed/vmlinux.lds.S b/arch/s390/boot/compressed/vmlinux.lds.S
index d43c2db12d306bd744eaa78df6405b3e0f905183..b16ac8b3c439390e35fa83ccb8ba17e35d3e2901 100644 (file)
--- a/arch/s390/boot/compressed/vmlinux.lds.S
+++ b/arch/s390/boot/compressed/vmlinux.lds.S
@@ -23,13 +23,10 @@ SECTIONS
                *(.text.*)
                _etext = . ;
        }
-       .rodata.compressed : {
-               *(.rodata.compressed)
-       }
        .rodata : {
                _rodata = . ;
                *(.rodata)       /* read-only data */
-               *(.rodata.*)
+               *(EXCLUDE_FILE (*piggy.o) .rodata.compressed)
                _erodata = . ;
        }
        .data : {
@@ -38,6 +35,15 @@ SECTIONS
                *(.data.*)
                _edata = . ;
        }
+       startup_continue = 0x100000;
+#ifdef CONFIG_KERNEL_UNCOMPRESSED
+       . = 0x100000;
+#else
+       . = ALIGN(8);
+#endif
+       .rodata.compressed : {
+               *(.rodata.compressed)
+       }
        . = ALIGN(256);
        .bss : {
                _bss = . ;
@@ -54,5 +60,6 @@ SECTIONS
                *(.eh_frame)
                *(__ex_table)
                *(*__ksymtab*)
+               *(___kcrctab*)
        }
 }