Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie...

[linux-2.6] / arch / powerpc / boot / of.c

diff --git a/arch/powerpc/boot/of.c b/arch/powerpc/boot/of.c
index 2cec5c17fb60dfd5634f66484befe0effda60262..d16ee3e3f868eb2592822d63ecff77e07faeccc9 100644 (file)
--- a/arch/powerpc/boot/of.c
+++ b/arch/powerpc/boot/of.c
@@ -173,7 +173,7 @@ static void *claim(unsigned long virt, unsigned long size, unsigned long align)
        return (void *) virt;
 }
 
-static void *of_try_claim(u32 size)
+static void *of_try_claim(unsigned long size)
 {
        unsigned long addr = 0;
 
@@ -282,6 +282,8 @@ void platform_init(unsigned long a1, unsigned long a2, void *promptr)
 
        prom = (int (*)(void *))promptr;
        loader_info.promptr = promptr;
-       loader_info.initrd_addr = a1;
-       loader_info.initrd_size = a2;
+       if (a1 && a2 && a2 != 0xdeadbeef) {
+               loader_info.initrd_addr = a1;
+               loader_info.initrd_size = a2;
+       }
 }