[POWERPC] Add gcc format warnings to zImage printf()

This patch adds the correct attributes to the zImage's versions of
printf to make gcc generate format string mismatch warnings.  It also
corrects several minor problems with format strings in the zImage thus
discovered.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index df9e95a840155af9dcbb73dbb1d4efa0b8c8285c..33c73295acf30bd0b1b3ba8a86e65e1c93db3da1 100644 (file)
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -136,7 +136,7 @@ static struct addr_range prep_kernel(void)
        } else {
                if ((unsigned long)_start < ei.memsize)
                        fatal("Insufficient memory for kernel at address 0!"
-                              " (_start=%lx)\n\r", _start);
+                              " (_start=%p)\n\r", _start);
        }
 
        /* Finally, gunzip the kernel */
@@ -145,7 +145,7 @@ static struct addr_range prep_kernel(void)
        /* discard up to the actual load data */
        gunzip_discard(&gzstate, ei.elfoffset - sizeof(elfheader));
        len = gunzip_finish(&gzstate, addr, ei.memsize);
-       printf("done 0x%lx bytes\n\r", len);
+       printf("done 0x%x bytes\n\r", len);
 
        flush_cache(addr, ei.loadsize);
 
@@ -189,7 +189,7 @@ static struct addr_range prep_initrd(struct addr_range vmlinux,
                if (! initrd_addr)
                        fatal("Can't allocate memory for initial "
                               "ramdisk !\n\r");
-               printf("Relocating initrd 0x%p <- 0x%p (0x%lx bytes)\n\r",
+               printf("Relocating initrd 0x%lx <- 0x%p (0x%lx bytes)\n\r",
                       initrd_addr, old_addr, initrd_size);
                memmove((void *)initrd_addr, old_addr, initrd_size);
        }

diff --git a/arch/powerpc/boot/stdio.h b/arch/powerpc/boot/stdio.h
index 73b8a91bfb34810c7af186448f6c0baf61000e93..adffc58412d4afcd8cf2e25c579fc1abcfe6a689 100644 (file)
--- a/arch/powerpc/boot/stdio.h
+++ b/arch/powerpc/boot/stdio.h
@@ -7,11 +7,12 @@
 #define        EINVAL          22      /* Invalid argument */
 #define ENOSPC         28      /* No space left on device */
 
-extern int printf(const char *fmt, ...);
+extern int printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
 
 #define fprintf(fmt, args...)  printf(args)
 
-extern int sprintf(char *buf, const char *fmt, ...);
+extern int sprintf(char *buf, const char *fmt, ...)
+       __attribute__((format(printf, 2, 3)));
 
 extern int vsprintf(char *buf, const char *fmt, va_list args);