]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
[S390] initrd: change default load address
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 9 Aug 2010 16:12:57 +0000 (18:12 +0200)
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>
Mon, 9 Aug 2010 16:12:54 +0000 (18:12 +0200)
Change default load address of the initrd in case of IPL from reader.
The new load address is directly behind the kernel image.
This way we can see immediatly if there are any problems with the code
which tries to rescue the initrd in case the bootmem bitmap would
overlap with the initrd.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/kernel/head.S

index 51838ad42d56d57f2b7c42c78d63eadff31f2291..db1696e210af496d0cd9a807b53dfdd7bebcf5d9 100644 (file)
@@ -366,7 +366,7 @@ iplstart:
        l       %r1,.Lstartup
        br      %r1
 
-.Linitrd:.long _end + 0x400000         # default address of initrd
+.Linitrd:.long _end                    # default address of initrd
 .Lparm:        .long  PARMAREA
 .Lstartup: .long startup
 .Lreset:.byte  0xc3,0xc8,0xc1,0xd5,0xc7,0xc5,0x40,0xd9,0xc4,0xd9,0x40