Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1bdfbd0 authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[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: default avatarOlaf Hering <olh@suse.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e6019db5

arch/ppc64/boot/main.c

+2 −5
Original line number Diff line number Diff line
@@ -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"