From aee5e87899c674e548727568fa627019df5b6380 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 9 Aug 2010 18:12:57 +0200 Subject: [PATCH] --- yaml --- r: 207862 b: refs/heads/master c: e033b9a0c6ca137388e363a7250809f85b35eb3f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/head.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a1980f890597..188b1edbfa60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41b42876772bb8c1cbd7e68d384791f97a5fd0d6 +refs/heads/master: e033b9a0c6ca137388e363a7250809f85b35eb3f diff --git a/trunk/arch/s390/kernel/head.S b/trunk/arch/s390/kernel/head.S index 51838ad42d56..db1696e210af 100644 --- a/trunk/arch/s390/kernel/head.S +++ b/trunk/arch/s390/kernel/head.S @@ -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