Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fae59c39e885148acf42320fe0d4ebf4cb3e9231
Commit:     fae59c39e885148acf42320fe0d4ebf4cb3e9231
Parent:     9da82a6dee9db4cd5ae7a74ab4f51afb52b6efb9
Author:     David Gibson <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 22 16:59:13 2007 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Mon Mar 26 15:11:20 2007 +1000

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/boot/main.c  |    6 +++---
 arch/powerpc/boot/stdio.h |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index df9e95a..33c7329 100644
--- 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 73b8a91..adffc58 100644
--- 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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to