git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
head.S
diff --git
a/arch/s390/kernel/head.S
b/arch/s390/kernel/head.S
index
51838ad
..
db1696e
100644
(file)
--- a/
arch/s390/kernel/head.S
+++ b/
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