Patchwork Fix hash_utils_64.c compile errors with DEBUG enabled.

login
register
mail settings
Submitter Sachin P. Sant
Date Dec. 14, 2009, 7 a.m.
Message ID <20091214070043.10313.12371.sendpatchset@localhost.localdomain>
Download mbox | patch
Permalink /patch/41070/
State Accepted
Commit 5c3399198791f7f828eb9fd504dbb46eef3cb472
Headers show

Comments

Sachin P. Sant - Dec. 14, 2009, 7 a.m.
Fix following build errors generated with DEBUG=1

cc1: warnings being treated as errors
arch/powerpc/mm/hash_utils_64.c: In function ‘htab_dt_scan_page_sizes’:
arch/powerpc/mm/hash_utils_64.c:345: error: format ‘%04x’ expects type ‘unsigned int’, but argument 4 has type ‘long unsigned int’
arch/powerpc/mm/hash_utils_64.c:345: error: format ‘%08x’ expects type ‘unsigned int’, but argument 5 has type ‘long unsigned int’
arch/powerpc/mm/hash_utils_64.c: In function ‘htab_initialize’:
... SNIP ...

Signed-off-by: Sachin Sant <sachinp@in.ibm.com>
---

Patch

diff -Naurp a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
--- a/arch/powerpc/mm/hash_utils_64.c	2009-12-14 11:14:01.000000000 +0530
+++ b/arch/powerpc/mm/hash_utils_64.c	2009-12-14 11:16:37.000000000 +0530
@@ -340,7 +340,7 @@  static int __init htab_dt_scan_page_size
 			else
 				def->tlbiel = 0;
 
-			DBG(" %d: shift=%02x, sllp=%04x, avpnm=%08x, "
+			DBG(" %d: shift=%02x, sllp=%04lx, avpnm=%08lx, "
 			    "tlbiel=%d, penc=%d\n",
 			    idx, shift, def->sllp, def->avpnm, def->tlbiel,
 			    def->penc);
@@ -663,7 +663,7 @@  static void __init htab_initialize(void)
 		base = (unsigned long)__va(lmb.memory.region[i].base);
 		size = lmb.memory.region[i].size;
 
-		DBG("creating mapping for region: %lx..%lx (prot: %x)\n",
+		DBG("creating mapping for region: %lx..%lx (prot: %lx)\n",
 		    base, size, prot);
 
 #ifdef CONFIG_U3_DART
@@ -1115,7 +1115,7 @@  void flush_hash_page(unsigned long va, r
 {
 	unsigned long hash, index, shift, hidx, slot;
 
-	DBG_LOW("flush_hash_page(va=%016x)\n", va);
+	DBG_LOW("flush_hash_page(va=%016lx)\n", va);
 	pte_iterate_hashed_subpages(pte, psize, va, index, shift) {
 		hash = hpt_hash(va, shift, ssize);
 		hidx = __rpte_to_hidx(pte, index);
@@ -1123,7 +1123,7 @@  void flush_hash_page(unsigned long va, r
 			hash = ~hash;
 		slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
 		slot += hidx & _PTEIDX_GROUP_IX;
-		DBG_LOW(" sub %d: hash=%x, hidx=%x\n", index, slot, hidx);
+		DBG_LOW(" sub %ld: hash=%lx, hidx=%lx\n", index, slot, hidx);
 		ppc_md.hpte_invalidate(slot, va, psize, ssize, local);
 	} pte_iterate_hashed_end();
 }