diff options
| author | Olaf Hering <olh@suse.de> | 2005-06-28 21:01:46 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-06-28 21:01:46 +1000 |
| commit | b1bdfbd0a29d6da4dbe42736faac02c43a9afe76 (patch) | |
| tree | 412b3cefaecc97862721ce5008fa3fddf8f4ff8b /arch/ppc64 | |
| parent | e6019db5a7f110839c62cefc073b6dc1143d6403 (diff) | |
| download | blackbird-op-linux-b1bdfbd0a29d6da4dbe42736faac02c43a9afe76.tar.gz blackbird-op-linux-b1bdfbd0a29d6da4dbe42736faac02c43a9afe76.zip | |
[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 <olh@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/boot/main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ppc64/boot/main.c b/arch/ppc64/boot/main.c index 677e4187497b..199d9804f61c 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" |
