From: Olaf Hering Date: Tue, 28 Jun 2005 11:01:46 +0000 (+1000) Subject: [PATCH] remove duplicate printf in arch/ppc64/boot/main.c X-Git-Tag: v2.6.13-rc2~38^2~17 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b1bdfbd0a29d6da4dbe42736faac02c43a9afe76;p=linux-2.6-omap-h63xx.git [PATCH] remove duplicate printf in arch/ppc64/boot/main.c initrd size is printed as hex, add a missing 0x remove a duplicate printf when initrd is used. remove use of kernel type to access the first bytes of the initrd memarea. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras --- diff --git a/arch/ppc64/boot/main.c b/arch/ppc64/boot/main.c index 677e4187497..199d9804f61 100644 --- a/arch/ppc64/boot/main.c +++ b/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"