[PATCH] remove duplicate printf in arch/ppc64/boot/main.c

Olaf Hering olh at suse.de
Sun May 8 07:52:20 EST 2005


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 <olh at suse.de>

Index: linux-2.6.12-rc4-olh/arch/ppc64/boot/main.c
===================================================================
--- linux-2.6.12-rc4-olh.orig/arch/ppc64/boot/main.c
+++ linux-2.6.12-rc4-olh/arch/ppc64/boot/main.c
@@ -146,10 +146,10 @@ void start(unsigned long a1, unsigned lo
 		}
 		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 lo
 
 	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"



More information about the Linuxppc64-dev mailing list