From d1628a200883352c4f88143276ab3dc006cb026a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 28 Jun 2005 21:01:46 +1000 Subject: [PATCH] --- yaml --- r: 4015 b: refs/heads/master c: b1bdfbd0a29d6da4dbe42736faac02c43a9afe76 h: refs/heads/master i: 4013: 6fa329a52891585430ae160a446da928b7a3acdb 4011: 8d1233f95d2b99a1b5f511125b8a76cba4356537 4007: 4214b7eed6f3db42214ac5cf58a1ae7c3fb7dba2 3999: 48ef3adb146540f3c3e3315f20178663501e820a v: v3 --- [refs] | 2 +- trunk/arch/ppc64/boot/main.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3feec77541cf..bb75c08992e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6019db5a7f110839c62cefc073b6dc1143d6403 +refs/heads/master: b1bdfbd0a29d6da4dbe42736faac02c43a9afe76 diff --git a/trunk/arch/ppc64/boot/main.c b/trunk/arch/ppc64/boot/main.c index 677e4187497b..199d9804f61c 100644 --- a/trunk/arch/ppc64/boot/main.c +++ b/trunk/arch/ppc64/boot/main.c @@ -146,10 +146,10 @@ void start(unsigned long a1, unsigned long a2, void *promptr) } a1 = initrd.addr; a2 = initrd.size; - printf("initial ramdisk moving 0x%lx <- 0x%lx (%lx bytes)\n\r", + printf("initial ramdisk moving 0x%lx <- 0x%lx (0x%lx bytes)\n\r", initrd.addr, (unsigned long)_initrd_start, initrd.size); memmove((void *)initrd.addr, (void *)_initrd_start, initrd.size); - printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr)); + printf("initrd head: 0x%lx\n\r", *((unsigned long *)initrd.addr)); } /* Eventually gunzip the kernel */ @@ -200,9 +200,6 @@ void start(unsigned long a1, unsigned long a2, void *promptr) flush_cache((void *)vmlinux.addr, vmlinux.size); - if (a1) - printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr)); - kernel_entry = (kernel_entry_t)vmlinux.addr; #ifdef DEBUG printf( "kernel:\n\r"