Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

David Gibson and committed by
Paul Mackerras
fae59c39 9da82a6d

+6 -5
+3 -3
arch/powerpc/boot/main.c
··· 136 136 } else { 137 137 if ((unsigned long)_start < ei.memsize) 138 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 142 /* Finally, gunzip the kernel */ ··· 145 145 /* discard up to the actual load data */ 146 146 gunzip_discard(&gzstate, ei.elfoffset - sizeof(elfheader)); 147 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 150 flush_cache(addr, ei.loadsize); 151 151 ··· 189 189 if (! initrd_addr) 190 190 fatal("Can't allocate memory for initial " 191 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 193 initrd_addr, old_addr, initrd_size); 194 194 memmove((void *)initrd_addr, old_addr, initrd_size); 195 195 }
+3 -2
arch/powerpc/boot/stdio.h
··· 7 7 #define EINVAL 22 /* Invalid argument */ 8 8 #define ENOSPC 28 /* No space left on device */ 9 9 10 - extern int printf(const char *fmt, ...); 10 + extern int printf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); 11 11 12 12 #define fprintf(fmt, args...) printf(args) 13 13 14 - extern int sprintf(char *buf, const char *fmt, ...); 14 + extern int sprintf(char *buf, const char *fmt, ...) 15 + __attribute__((format(printf, 2, 3))); 15 16 16 17 extern int vsprintf(char *buf, const char *fmt, va_list args); 17 18