diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2012-09-28 23:14:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-02 23:20:34 -0400 |
commit | 5da444aae54f64575a60f1d596ed7706e3089fb0 (patch) | |
tree | 50eb6a60a9c56fc2eaa10d06eb62d28f105058bb /arch/sparc/mm/init_64.c | |
parent | 97da37b35fc56ed7b2b1583208be0d1327ddcf30 (diff) |
sparc: fix format string argument for prom_printf()
prom_printf() takes printf style arguments. Specifing GCC's format
attribute reveals that there are several wrong usages of prom_printf().
This fixes those wrong format strings and arguments, and also leaves
format attributes in order to detect similar mistakes at compile time.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm/init_64.c')
-rw-r--r-- | arch/sparc/mm/init_64.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 696bb095e0fc..7a9b788c6ced 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
@@ -119,7 +119,8 @@ static void __init read_obp_memory(const char *property, | |||
119 | 119 | ||
120 | ret = prom_getproperty(node, property, (char *) regs, prop_size); | 120 | ret = prom_getproperty(node, property, (char *) regs, prop_size); |
121 | if (ret == -1) { | 121 | if (ret == -1) { |
122 | prom_printf("Couldn't get %s property from /memory.\n"); | 122 | prom_printf("Couldn't get %s property from /memory.\n", |
123 | property); | ||
123 | prom_halt(); | 124 | prom_halt(); |
124 | } | 125 | } |
125 | 126 | ||
@@ -497,7 +498,7 @@ static void __init read_obp_translations(void) | |||
497 | prom_halt(); | 498 | prom_halt(); |
498 | } | 499 | } |
499 | if (unlikely(n > sizeof(prom_trans))) { | 500 | if (unlikely(n > sizeof(prom_trans))) { |
500 | prom_printf("prom_mappings: Size %Zd is too big.\n", n); | 501 | prom_printf("prom_mappings: Size %d is too big.\n", n); |
501 | prom_halt(); | 502 | prom_halt(); |
502 | } | 503 | } |
503 | 504 | ||
@@ -559,7 +560,7 @@ static void __init hypervisor_tlb_lock(unsigned long vaddr, | |||
559 | unsigned long ret = sun4v_mmu_map_perm_addr(vaddr, 0, pte, mmu); | 560 | unsigned long ret = sun4v_mmu_map_perm_addr(vaddr, 0, pte, mmu); |
560 | 561 | ||
561 | if (ret != 0) { | 562 | if (ret != 0) { |
562 | prom_printf("hypervisor_tlb_lock[%lx:%lx:%lx:%lx]: " | 563 | prom_printf("hypervisor_tlb_lock[%lx:%x:%lx:%lx]: " |
563 | "errors with %lx\n", vaddr, 0, pte, mmu, ret); | 564 | "errors with %lx\n", vaddr, 0, pte, mmu, ret); |
564 | prom_halt(); | 565 | prom_halt(); |
565 | } | 566 | } |