[ 030/173] powerpc: fix wii_memory_fixups() compile error on 3.0.y tree

From: Ben Hutchings
Date: Fri Dec 28 2012 - 14:23:29 EST


3.2-stable review patch. If anyone has any objections, please let me know.

------------------

From: Shuah Khan <shuah.khan@xxxxxx>

Fix wii_memory_fixups() the following compile error on 3.0.y tree with
wii_defconfig on 3.0.y tree.

CC arch/powerpc/platforms/embedded6xx/wii.o
arch/powerpc/platforms/embedded6xx/wii.c: In function â??wii_memory_fixupsâ??:
arch/powerpc/platforms/embedded6xx/wii.c:88:2: error: format â??%llxâ?? expects argument of type â??long long unsigned intâ??, but argument 2 has type â??phys_addr_tâ?? [-Werror=format]
arch/powerpc/platforms/embedded6xx/wii.c:88:2: error: format â??%llxâ?? expects argument of type â??long long unsigned intâ??, but argument 3 has type â??phys_addr_tâ?? [-Werror=format]
arch/powerpc/platforms/embedded6xx/wii.c:90:2: error: format â??%llxâ?? expects argument of type â??long long unsigned intâ??, but argument 2 has type â??phys_addr_tâ?? [-Werror=format]
arch/powerpc/platforms/embedded6xx/wii.c:90:2: error: format â??%llxâ?? expects argument of type â??long long unsigned intâ??, but argument 3 has type â??phys_addr_tâ?? [-Werror=format]
cc1: all warnings being treated as errors
make[2]: *** [arch/powerpc/platforms/embedded6xx/wii.o] Error 1
make[1]: *** [arch/powerpc/platforms/embedded6xx] Error 2
make: *** [arch/powerpc/platforms] Error 2

Signed-off-by: Shuah Khan <shuah.khan@xxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
arch/powerpc/platforms/embedded6xx/wii.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 1b5dc1a..daf793b 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -85,9 +85,11 @@ void __init wii_memory_fixups(void)
wii_hole_start = p[0].base + p[0].size;
wii_hole_size = p[1].base - wii_hole_start;

- pr_info("MEM1: <%08llx %08llx>\n", p[0].base, p[0].size);
+ pr_info("MEM1: <%08llx %08llx>\n",
+ (unsigned long long) p[0].base, (unsigned long long) p[0].size);
pr_info("HOLE: <%08lx %08lx>\n", wii_hole_start, wii_hole_size);
- pr_info("MEM2: <%08llx %08llx>\n", p[1].base, p[1].size);
+ pr_info("MEM2: <%08llx %08llx>\n",
+ (unsigned long long) p[1].base, (unsigned long long) p[1].size);

p[0].size += wii_hole_size + p[1].size;



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/