Convert %q to %ll in format strings

ok natano@ krw@

6 files changed, 22 insertions, 22 deletions

diff --git a/sys/arch/sparc64/dev/ebus.c b/sys/arch/sparc64/dev/ebus.c
index e7c4f667d11..ff088f0f254 100644
--- a/sys/arch/sparc64/dev/ebus.c
+++ b/sys/arch/sparc64/dev/ebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ebus.c,v 1.23 2014/07/12 18:44:43 tedu Exp $	*/
+/*	$OpenBSD: ebus.c,v 1.24 2016/08/23 03:28:01 guenther Exp $	*/
 /*	$NetBSD: ebus.c,v 1.24 2001/07/25 03:49:54 eeh Exp $	*/
 
 /*
@@ -465,8 +465,8 @@ _ebus_bus_map(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t offset,
 				       range[i].phys_lo;
 		pciaddr += lo;
 		DPRINTF(EDB_BUSMAP,
-		    ("\n_ebus_bus_map: mapping space %x paddr offset %qx "
-		    "pciaddr %qx\n", (int)t->default_type,
+		    ("\n_ebus_bus_map: mapping space %x paddr offset %llx "
+		    "pciaddr %llx\n", (int)t->default_type,
 		    (unsigned long long)offset, (unsigned long long)pciaddr));
                 return ((*t->sparc_bus_map)(t, t0, pciaddr, size, flags, hp));
 	}
@@ -497,7 +497,7 @@ ebus_bus_mmap(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t paddr,
 		if (offset != paddr)
 			continue;
 
-		DPRINTF(EDB_BUSMAP, ("\n_ebus_bus_mmap: mapping paddr %qx\n",
+		DPRINTF(EDB_BUSMAP, ("\n_ebus_bus_mmap: mapping paddr %llx\n",
 		    (unsigned long long)paddr));
 		return ((*t->sparc_bus_mmap)(t, t0, paddr, off, prot, flags));
 	}
diff --git a/sys/arch/sparc64/dev/ebus_mainbus.c b/sys/arch/sparc64/dev/ebus_mainbus.c
index 8eb2084241f..7bfd7193b85 100644
--- a/sys/arch/sparc64/dev/ebus_mainbus.c
+++ b/sys/arch/sparc64/dev/ebus_mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ebus_mainbus.c,v 1.9 2015/09/27 11:29:20 kettenis Exp $	*/
+/*	$OpenBSD: ebus_mainbus.c,v 1.10 2016/08/23 03:28:01 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007 Mark Kettenis
@@ -226,7 +226,7 @@ ebus_mainbus_bus_map(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t offset,
 				    range[i].phys_lo;
 		addr += lo;
 		DPRINTF(EDB_BUSMAP,
-		    ("\n_ebus_mainbus_bus_map: paddr offset %qx addr %qx\n", 
+		    ("\n_ebus_mainbus_bus_map: paddr offset %llx addr %llx\n", 
 		    (unsigned long long)offset, (unsigned long long)addr));
                 return ((*t->sparc_bus_map)(t, t0, addr, size, flags, hp));
 	}
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index 5dde1429d63..997c9758e31 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psycho.c,v 1.73 2014/07/12 22:37:03 uebayasi Exp $	*/
+/*	$OpenBSD: psycho.c,v 1.74 2016/08/23 03:28:01 guenther Exp $	*/
 /*	$NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $	*/
 
 /*
@@ -1000,7 +1000,7 @@ psycho_bus_map(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t offset,
 	struct psycho_pbm *pp = t->cookie;
 	int i, ss;
 
-	DPRINTF(PDB_BUSMAP, ("\npsycho_bus_map: type %d off %qx sz %qx "
+	DPRINTF(PDB_BUSMAP, ("\npsycho_bus_map: type %d off %llx sz %llx "
 	    "flags %d", t->default_type, (unsigned long long)offset,
 	    (unsigned long long)size, flags));
 
@@ -1029,7 +1029,7 @@ psycho_bus_map(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t offset,
 		paddr |= ((bus_addr_t)pp->pp_range[i].phys_hi) << 32;
 		DPRINTF(PDB_BUSMAP,
 		    ("\n_psycho_bus_map: mapping paddr space %lx offset %lx "
-			"paddr %qx",
+			"paddr %llx",
 		    (long)ss, (long)offset,
 		    (unsigned long long)paddr));
 		return ((*t->sparc_bus_map)(t, t0, paddr, size, flags, hp));
@@ -1048,7 +1048,7 @@ psycho_bus_mmap(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t paddr,
 
 	ss = t->default_type;
 
-	DPRINTF(PDB_BUSMAP, ("\n_psycho_bus_mmap: prot %d flags %d pa %qx",
+	DPRINTF(PDB_BUSMAP, ("\n_psycho_bus_mmap: prot %d flags %d pa %llx",
 	    prot, flags, (unsigned long long)paddr));
 
 	if (t->parent == 0 || t->parent->sparc_bus_mmap == 0) {
@@ -1067,7 +1067,7 @@ psycho_bus_mmap(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t paddr,
 		paddr = pp->pp_range[i].phys_lo + offset;
 		paddr |= ((bus_addr_t)pp->pp_range[i].phys_hi) << 32;
 		DPRINTF(PDB_BUSMAP, ("\npsycho_bus_mmap: mapping paddr "
-		    "space %lx offset %lx paddr %qx",
+		    "space %lx offset %lx paddr %llx",
 		    (long)ss, (long)offset,
 		    (unsigned long long)paddr));
 		return ((*t->sparc_bus_mmap)(t, t0, paddr, off, prot, flags));
@@ -1293,16 +1293,16 @@ found:
 	 */
 	if (intrmapptr) {
 		intrmap = *intrmapptr;
-		DPRINTF(PDB_INTR, ("; read intrmap = %016qx",
+		DPRINTF(PDB_INTR, ("; read intrmap = %016llx",
 			(unsigned long long)intrmap));
 
 		/* Enable the interrupt */
 		intrmap |= INTMAP_V;
 		DPRINTF(PDB_INTR, ("; addr of intrmapptr = %p", intrmapptr));
-		DPRINTF(PDB_INTR, ("; writing intrmap = %016qx",
+		DPRINTF(PDB_INTR, ("; writing intrmap = %016llx",
 			(unsigned long long)intrmap));
 		*intrmapptr = intrmap;
-		DPRINTF(PDB_INTR, ("; reread intrmap = %016qx",
+		DPRINTF(PDB_INTR, ("; reread intrmap = %016llx",
 			(unsigned long long)(intrmap = *intrmapptr)));
 	}
 	return (ih);
diff --git a/sys/arch/sparc64/dev/pyro.c b/sys/arch/sparc64/dev/pyro.c
index 668ee637603..b95d6cc1a82 100644
--- a/sys/arch/sparc64/dev/pyro.c
+++ b/sys/arch/sparc64/dev/pyro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pyro.c,v 1.28 2014/12/09 06:58:29 doug Exp $	*/
+/*	$OpenBSD: pyro.c,v 1.29 2016/08/23 03:28:01 guenther Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -534,7 +534,7 @@ pyro_bus_map(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t offset,
 	struct pyro_pbm *pbm = t->cookie;
 	int i, ss;
 
-	DPRINTF(PDB_BUSMAP, ("pyro_bus_map: type %d off %qx sz %qx flags %d",
+	DPRINTF(PDB_BUSMAP, ("pyro_bus_map: type %d off %llx sz %llx flags %d",
 	    t->default_type,
 	    (unsigned long long)offset,
 	    (unsigned long long)size,
@@ -578,7 +578,7 @@ pyro_bus_mmap(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t paddr,
 
 	ss = t->default_type;
 
-	DPRINTF(PDB_BUSMAP, ("pyro_bus_mmap: prot %d flags %d pa %qx\n",
+	DPRINTF(PDB_BUSMAP, ("pyro_bus_mmap: prot %d flags %d pa %llx\n",
 	    prot, flags, (unsigned long long)paddr));
 
 	if (t->parent == 0 || t->parent->sparc_bus_mmap == 0) {
diff --git a/sys/arch/sparc64/dev/schizo.c b/sys/arch/sparc64/dev/schizo.c
index 1bedaf5fb81..20799342bfd 100644
--- a/sys/arch/sparc64/dev/schizo.c
+++ b/sys/arch/sparc64/dev/schizo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: schizo.c,v 1.66 2014/07/12 18:44:43 tedu Exp $	*/
+/*	$OpenBSD: schizo.c,v 1.67 2016/08/23 03:28:01 guenther Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -669,7 +669,7 @@ schizo_bus_map(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t offset,
 	struct schizo_pbm *pbm = t->cookie;
 	int i, ss;
 
-	DPRINTF(SDB_BUSMAP, ("schizo_bus_map: type %d off %qx sz %qx flags %d",
+	DPRINTF(SDB_BUSMAP,("schizo_bus_map: type %d off %llx sz %llx flags %d",
 	    t->default_type,
 	    (unsigned long long)offset,
 	    (unsigned long long)size,
@@ -713,7 +713,7 @@ schizo_bus_mmap(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t paddr,
 
 	ss = t->default_type;
 
-	DPRINTF(SDB_BUSMAP, ("schizo_bus_mmap: prot %d flags %d pa %qx\n",
+	DPRINTF(SDB_BUSMAP, ("schizo_bus_mmap: prot %d flags %d pa %llx\n",
 	    prot, flags, (unsigned long long)paddr));
 
 	if (t->parent == 0 || t->parent->sparc_bus_mmap == 0) {
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index 73fdeee3dbc..8b72b108cfb 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.42 2016/03/14 23:08:05 krw Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.43 2016/08/23 03:28:01 guenther Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
 
 /*
@@ -831,7 +831,7 @@ db_pmap_kernel(addr, have_addr, count, modif)
 		/* lookup an entry for this VA */
 		
 		if ((data = pseg_get(&kernel_pmap_, (vaddr_t)addr))) {
-			db_printf("pmap_kernel(%p)->pm_segs[%lx][%lx][%lx]=>%qx\n",
+			db_printf("pmap_kernel(%p)->pm_segs[%lx][%lx][%lx]=>%llx\n",
 				  (void *)addr, (u_long)va_to_seg(addr), 
 				  (u_long)va_to_dir(addr), (u_long)va_to_pte(addr),
 				  (unsigned long long)data);