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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
cuboot-85xx.c
diff --git
a/arch/powerpc/boot/cuboot-85xx.c
b/arch/powerpc/boot/cuboot-85xx.c
index
f88ba00
..
e256031
100644
(file)
--- a/
arch/powerpc/boot/cuboot-85xx.c
+++ b/
arch/powerpc/boot/cuboot-85xx.c
@@
-58,7
+58,7
@@
void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
memcpy(&bd, (bd_t *)r3, sizeof(bd));
loader_info.initrd_addr = r4;
- loader_info.initrd_size = r4 ? r5 : 0;
+ loader_info.initrd_size = r4 ? r5
- r4
: 0;
loader_info.cmdline = (char *)r6;
loader_info.cmdline_len = r7 - r6;