diff options
author | Olaf Hering <olh@suse.de> | 2005-06-28 07:01:46 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-06-28 07:01:46 -0400 |
commit | b1bdfbd0a29d6da4dbe42736faac02c43a9afe76 (patch) | |
tree | 412b3cefaecc97862721ce5008fa3fddf8f4ff8b | |
parent | e6019db5a7f110839c62cefc073b6dc1143d6403 (diff) |
[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>
-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) | |||
146 | } | 146 | } |
147 | a1 = initrd.addr; | 147 | a1 = initrd.addr; |
148 | a2 = initrd.size; | 148 | a2 = initrd.size; |
149 | printf("initial ramdisk moving 0x%lx <- 0x%lx (%lx bytes)\n\r", | 149 | printf("initial ramdisk moving 0x%lx <- 0x%lx (0x%lx bytes)\n\r", |
150 | initrd.addr, (unsigned long)_initrd_start, initrd.size); | 150 | initrd.addr, (unsigned long)_initrd_start, initrd.size); |
151 | memmove((void *)initrd.addr, (void *)_initrd_start, initrd.size); | 151 | memmove((void *)initrd.addr, (void *)_initrd_start, initrd.size); |
152 | printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr)); | 152 | printf("initrd head: 0x%lx\n\r", *((unsigned long *)initrd.addr)); |
153 | } | 153 | } |
154 | 154 | ||
155 | /* Eventually gunzip the kernel */ | 155 | /* Eventually gunzip the kernel */ |
@@ -200,9 +200,6 @@ void start(unsigned long a1, unsigned long a2, void *promptr) | |||
200 | 200 | ||
201 | flush_cache((void *)vmlinux.addr, vmlinux.size); | 201 | flush_cache((void *)vmlinux.addr, vmlinux.size); |
202 | 202 | ||
203 | if (a1) | ||
204 | printf("initrd head: 0x%lx\n\r", *((u32 *)initrd.addr)); | ||
205 | |||
206 | kernel_entry = (kernel_entry_t)vmlinux.addr; | 203 | kernel_entry = (kernel_entry_t)vmlinux.addr; |
207 | #ifdef DEBUG | 204 | #ifdef DEBUG |
208 | printf( "kernel:\n\r" | 205 | printf( "kernel:\n\r" |