From 2a03a4dac39269b169035cc0283198f80519587b Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Sat, 12 May 2007 03:52:03 +1000 Subject: [PATCH] --- yaml --- r: 56281 b: refs/heads/master c: dab4d7984ee61c8eb25569b12e7a996f5aaef2ba h: refs/heads/master i: 56279: 8f899a22cb8988ec55177a2d85b372eab077def0 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/cuboot-83xx.c | 2 +- trunk/arch/powerpc/boot/cuboot-85xx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8063a9071f0a..bbbc2f1f2367 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36bd2836f39d9c256689475432dd7d36eda1c491 +refs/heads/master: dab4d7984ee61c8eb25569b12e7a996f5aaef2ba diff --git a/trunk/arch/powerpc/boot/cuboot-83xx.c b/trunk/arch/powerpc/boot/cuboot-83xx.c index 6cbc20afb4d8..9af554eea54b 100644 --- a/trunk/arch/powerpc/boot/cuboot-83xx.c +++ b/trunk/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; diff --git a/trunk/arch/powerpc/boot/cuboot-85xx.c b/trunk/arch/powerpc/boot/cuboot-85xx.c index f88ba00ac122..e2560317f278 100644 --- a/trunk/arch/powerpc/boot/cuboot-85xx.c +++ b/trunk/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;