Index: arch/ia64/src/interrupt.c
===================================================================
--- arch/ia64/src/interrupt.c	(revision 68091bdbde5f024c9fe32f6a32b8a6cbd415a620)
+++ arch/ia64/src/interrupt.c	(revision 12c7f27b4fc44ac2d4bb7ef6ea741ea7a8ad1dff)
@@ -132,12 +132,12 @@
 	putchar('\n');
 	printf("Interrupted context dump:\n");
-	printf("ar.bsp=%P\tar.bspstore=%P\n", istate->ar_bsp, istate->ar_bspstore);
-	printf("ar.rnat=%#llX\tar.rsc=%$llX\n", istate->ar_rnat, istate->ar_rsc);
-	printf("ar.ifs=%#llX\tar.pfs=%#llX\n", istate->ar_ifs, istate->ar_pfs);
-	printf("cr.isr=%#llX\tcr.ipsr=%#llX\t\n", istate->cr_isr.value, istate->cr_ipsr);
+	printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp, istate->ar_bspstore);
+	printf("ar.rnat=%#llx\tar.rsc=%$llx\n", istate->ar_rnat, istate->ar_rsc);
+	printf("ar.ifs=%#llx\tar.pfs=%#llx\n", istate->ar_ifs, istate->ar_pfs);
+	printf("cr.isr=%#llx\tcr.ipsr=%#llx\t\n", istate->cr_isr.value, istate->cr_ipsr);
 	
-	printf("cr.iip=%#llX, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei ,iip ? iip : "?");
-	printf("cr.iipa=%#llX\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
-	printf("cr.ifa=%#llX\t(%s)\n", istate->cr_ifa, ifa ? ifa : "?");
+	printf("cr.iip=%#llx, #%d\t(%s)\n", istate->cr_iip, istate->cr_isr.ei, iip ? iip : "?");
+	printf("cr.iipa=%#llx\t(%s)\n", istate->cr_iipa, iipa ? iipa : "?");
+	printf("cr.ifa=%#llx\t(%s)\n", istate->cr_ifa, ifa ? ifa : "?");
 }
 
@@ -183,5 +183,5 @@
 #else
 	dump_interrupted_context(istate);
-	panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
+	panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
 #endif
 }
@@ -218,5 +218,5 @@
 {
 	dump_interrupted_context(istate);
-	panic("Interruption: %#hX (%s)\n", (__u16) vector, vector_to_string(vector));
+	panic("Interruption: %#hx (%s)\n", (__u16) vector, vector_to_string(vector));
 }
 
Index: arch/ia64/src/mm/tlb.c
===================================================================
--- arch/ia64/src/mm/tlb.c	(revision 68091bdbde5f024c9fe32f6a32b8a6cbd415a620)
+++ arch/ia64/src/mm/tlb.c	(revision 12c7f27b4fc44ac2d4bb7ef6ea741ea7a8ad1dff)
@@ -449,5 +449,5 @@
 		page_table_unlock(AS, true);
 		if (!as_page_fault(va)) {
-			panic("%s: va=%P, rid=%d, iip=%P\n", __FUNCTION__, istate->cr_ifa, rr.map.rid, istate->cr_iip);
+			panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, istate->cr_ifa, rr.map.rid, istate->cr_iip);
 		}
 	}
@@ -495,5 +495,5 @@
 		page_table_unlock(AS, true);
 		if (!as_page_fault(va)) {
-			panic("%s: va=%P, rid=%d, iip=%P\n", __FUNCTION__, va, rid, istate->cr_iip);
+			panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
 		}
 	}
@@ -610,5 +610,5 @@
 		page_table_unlock(AS, true);
 		if (!as_page_fault(va)) {
-			panic("%s: va=%P, rid=%d\n", __FUNCTION__, va, rr.map.rid);
+			panic("%s: va=%p, rid=%d\n", __FUNCTION__, va, rr.map.rid);
 		}
 	}
