aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/boot/main.c6
-rw-r--r--arch/powerpc/boot/stdio.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index df9e95a8401..33c73295acf 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -136,7 +136,7 @@ static struct addr_range prep_kernel(void)
136 } else { 136 } else {
137 if ((unsigned long)_start < ei.memsize) 137 if ((unsigned long)_start < ei.memsize)
138 fatal("Insufficient memory for kernel at address 0!" 138 fatal("Insufficient memory for kernel at address 0!"
139 " (_start=%lx)\n\r", _start); 139 " (_start=%p)\n\r", _start);
140 } 140 }
141 141
142 /* Finally, gunzip the kernel */ 142 /* Finally, gunzip the kernel */
@@ -145,7 +145,7 @@ static struct addr_range prep_kernel(void)
145 /* discard up to the actual load data */ 145 /* discard up to the actual load data */
146 gunzip_discard(&gzstate, ei.elfoffset - sizeof(elfheader)); 146 gunzip_discard(&gzstate, ei.elfoffset - sizeof(elfheader));
147 len = gunzip_finish(&gzstate, addr, ei.memsize); 147 len = gunzip_finish(&gzstate, addr, ei.memsize);
148 printf("done 0x%lx bytes\n\r", len); 148 printf("done 0x%x bytes\n\r", len);
149 149
150 flush_cache(addr, ei.loadsize); 150 flush_cache(addr, ei.loadsize);
151 151
@@ -189,7 +189,7 @@ static struct addr_range prep_initrd(struct addr_range vmlinux,
189 if (! initrd_addr) 189 if (! initrd_addr)
190 fatal("Can't allocate memory for initial " 190 fatal("Can't allocate memory for initial "
191 "ramdisk !\n\r"); 191 "ramdisk !\n\r");
192 printf("Relocating initrd 0x%p <- 0x%p (0x%lx bytes)\n\r", 192 printf("Relocating initrd 0x%lx <- 0x%p (0x%lx bytes)\n\r",
193 initrd_addr, old_addr, initrd_size); 193 initrd_addr, old_addr, initrd_size);
194 memmove((void *)initrd_addr, old_addr, initrd_size); 194 memmove((void *)initrd_addr, old_addr, initrd_size);
195 } 195 }
diff --git a/arch/powerpc/boot/stdio.h b/arch/powerpc/boot/stdio.h
index 73b8a91bfb3..adffc58412d 100644
--- a/arch/powerpc/boot/stdio.h
+++ b/arch/powerpc/boot/stdio.h
@@ -7,11 +7,12 @@
7#define EINVAL 22 /* Invalid argument */ 7#define EINVAL 22 /* Invalid argument */
8#define ENOSPC 28 /* No space left on device */ 8#define ENOSPC 28 /* No space left on device */
9 9
10extern int printf(const char *fmt, ...); 10extern int printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
11 11
12#define fprintf(fmt, args...) printf(args) 12#define fprintf(fmt, args...) printf(args)
13 13
14extern int sprintf(char *buf, const char *fmt, ...); 14extern int sprintf(char *buf, const char *fmt, ...)
15 __attribute__((format(printf, 2, 3)));
15 16
16extern int vsprintf(char *buf, const char *fmt, va_list args); 17extern int vsprintf(char *buf, const char *fmt, va_list args);
17 18