Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6] / arch / powerpc / boot / cuboot-83xx.c

diff --git a/arch/powerpc/boot/cuboot-83xx.c b/arch/powerpc/boot/cuboot-83xx.c
index 6cbc20afb4d8bccb28e64337d9cd408eadbec259..9af554eea54be6ea105639e05185b3fe5e221a95 100644 (file)
--- a/arch/powerpc/boot/cuboot-83xx.c
+++ b/arch/powerpc/boot/cuboot-83xx.c
@@ -57,7 +57,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;