Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c339919 authored by Sachin P. Sant's avatar Sachin P. Sant Committed by Benjamin Herrenschmidt
Browse files

powerpc/mm: Fix hash_utils_64.c compile errors with DEBUG enabled. 



This time without the funny characters.

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:343: error: format '%04x' expects type 'unsigned int', but argument 4 has type 'long unsigned int'
arch/powerpc/mm/hash_utils_64.c:343: 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':
arch/powerpc/mm/hash_utils_64.c:666: error: format '%x' expects type 'unsigned int', but argument 4 has type 'long unsigned int'
... SNIP ...

Signed-off-by: default avatarSachin Sant <sachinp@in.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 01ae45bc

arch/powerpc/mm/hash_utils_64.c

+4 −4
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int __init htab_dt_scan_page_sizes(unsigned long node, 
			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, real_pte_t pte, int psize, int ssize, 
{

	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, real_pte_t pte, int psize, int ssize, 
			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();

}