Fixed printf format errors.

4 files changed, 34 insertions, 25 deletions

diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index 2fc0539..a09cb48 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.5 1998/04/17 22:36:26 des Exp $
+ *      $Id: busdma_machdep.c,v 1.6 1998/05/06 01:45:55 gibbs Exp $
  */
 
 #include <sys/param.h>
@@ -458,7 +458,7 @@ bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
 	} while (buflen > 0);
 
 	if (buflen != 0) {
-		printf("bus_dmamap_load: Too many segs! buf_len = 0x%x\n",
+		printf("bus_dmamap_load: Too many segs! buf_len = 0x%lx\n",
 		       buflen);
 		error = EFBIG;
 	}
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 7ac5f5e..d504941 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.49 1998/06/30 19:41:21 phk Exp $
+ *	$Id: identcpu.c,v 1.50 1998/07/11 05:59:34 bde Exp $
  */
 
 #include "opt_cpu.h"
@@ -470,15 +470,15 @@ printcpuinfo(void)
 	if(*cpu_vendor)
 		printf("  Origin = \"%s\"",cpu_vendor);
 	if(cpu_id)
-		printf("  Id = 0x%lx",cpu_id);
+		printf("  Id = 0x%x", cpu_id);
 
 	if (strcmp(cpu_vendor, "GenuineIntel") == 0 ||
 	    strcmp(cpu_vendor, "AuthenticAMD") == 0 ||
 		((strcmp(cpu_vendor, "CyrixInstead") == 0) &&
 		 ((cpu_id & 0xf00) > 5))) {
-		printf("  Stepping=%ld", cpu_id & 0xf);
+		printf("  Stepping=%u", cpu_id & 0xf);
 		if (strcmp(cpu_vendor, "CyrixInstead") == 0)
-			printf("  DIR=0x%04lx", cyrix_did);
+			printf("  DIR=0x%04x", cyrix_did);
 		if (cpu_high > 0) {
 			/*
 			 * Here we should probably set up flags indicating
@@ -525,9 +525,9 @@ printcpuinfo(void)
 			);
 		}
 	} else if (strcmp(cpu_vendor, "CyrixInstead") == 0) {
-		printf("  DIR=0x%04lx", cyrix_did);
-		printf("  Stepping=%ld", (cyrix_did & 0xf000) >> 12);
-		printf("  Revision=%ld", (cyrix_did & 0x0f00) >> 8);
+		printf("  DIR=0x%04x", cyrix_did);
+		printf("  Stepping=%u", (cyrix_did & 0xf000) >> 12);
+		printf("  Revision=%u", (cyrix_did & 0x0f00) >> 8);
 #ifndef CYRIX_CACHE_REALLY_WORKS
 		if (cpu == CPU_M1 && (cyrix_did & 0xff00) < 0x1700)
 			printf("\n  CPU cache: write-through mode");
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 6e31276..c991f91 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.301 1998/06/21 17:46:53 bde Exp $
+ *	$Id: machdep.c,v 1.302 1998/06/30 21:25:58 phk Exp $
  */
 
 #include "apm.h"
@@ -265,8 +265,9 @@ cpu_startup(dummy)
 		for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {
 			int size1 = phys_avail[indx + 1] - phys_avail[indx];
 
-			printf("0x%08lx - 0x%08lx, %d bytes (%d pages)\n", phys_avail[indx],
-			    phys_avail[indx + 1] - 1, size1, size1 / PAGE_SIZE);
+			printf("0x%08x - 0x%08x, %d bytes (%d pages)\n",
+			    phys_avail[indx], phys_avail[indx + 1] - 1, size1,
+			    size1 / PAGE_SIZE);
 		}
 	}
 
@@ -1327,7 +1328,7 @@ init386(first)
 			vm_offset_t pa;
 
 			printf(
-	"BIOS basemem (%ldK) != RTC basemem (%dK), setting to BIOS value\n",
+	"BIOS basemem (%uK) != RTC basemem (%uK), setting to BIOS value\n",
 			       bootinfo.bi_basemem, biosbasemem);
 			biosbasemem = bootinfo.bi_basemem;
 
@@ -1360,7 +1361,7 @@ init386(first)
 			}
 		}
 		if (bootinfo.bi_extmem != biosextmem)
-			printf("BIOS extmem (%ldK) != RTC extmem (%dK)\n",
+			printf("BIOS extmem (%uK) != RTC extmem (%uK)\n",
 			       bootinfo.bi_extmem, biosextmem);
 	}
 
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 33f9a9e..f85f4be 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.201 1998/05/19 08:58:48 phk Exp $
+ *	$Id: pmap.c,v 1.202 1998/05/21 07:47:34 dyson Exp $
  */
 
 /*
@@ -535,7 +535,10 @@ pmap_setdevram(unsigned long long basea, vm_offset_t sizea)
 		PPro_vmtrr[free].mask = mask;
 		wrmsr(PPRO_VMTRRphysBase0 + free * 2, base);
 		wrmsr(PPRO_VMTRRphysMask0 + free * 2, mask);
-		printf("pmap: added WC mapping at page: 0x%x %x, size: %d mask: 0x%x %x\n", base, sizea, mask);
+		printf(
+	"pmap: added WC mapping at page: 0x%x %x, size: %u mask: 0x%x %x\n",
+		    (u_int)(base >> 32), (u_int)base, sizea,
+		    (u_int)(mask >> 32), (u_int)mask);
 	}
 }
 
@@ -1777,7 +1780,9 @@ pmap_remove_pte(pmap, ptq, va)
 		if (oldpte & PG_M) {
 #if defined(PMAP_DIAGNOSTIC)
 			if (pmap_nw_modified((pt_entry_t) oldpte)) {
-				printf("pmap_remove: modified page not writable: va: 0x%lx, pte: 0x%lx\n", va, (int) oldpte);
+				printf(
+	"pmap_remove: modified page not writable: va: 0x%x, pte: 0x%x\n",
+				    va, oldpte);
 			}
 #endif
 			if (pmap_track_modified(va))
@@ -1977,7 +1982,9 @@ pmap_remove_all(pa)
 		if (tpte & PG_M) {
 #if defined(PMAP_DIAGNOSTIC)
 			if (pmap_nw_modified((pt_entry_t) tpte)) {
-				printf("pmap_remove_all: modified page not writable: va: 0x%lx, pte: 0x%lx\n", pv->pv_va, tpte);
+				printf(
+	"pmap_remove_all: modified page not writable: va: 0x%x, pte: 0x%x\n",
+				    pv->pv_va, tpte);
 			}
 #endif
 			if (pmap_track_modified(pv->pv_va))
@@ -2195,7 +2202,9 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_offset_t pa, vm_prot_t prot,
 
 #if defined(PMAP_DIAGNOSTIC)
 		if (pmap_nw_modified((pt_entry_t) origpte)) {
-			printf("pmap_enter: modified page not writable: va: 0x%lx, pte: 0x%lx\n", va, origpte);
+			printf(
+	"pmap_enter: modified page not writable: va: 0x%x, pte: 0x%x\n",
+			    va, origpte);
 		}
 #endif
 
@@ -3057,7 +3066,7 @@ pmap_testbit(pa, bit)
 
 #if defined(PMAP_DIAGNOSTIC)
 		if (!pv->pv_pmap) {
-			printf("Null pmap (tb) at va: 0x%lx\n", pv->pv_va);
+			printf("Null pmap (tb) at va: 0x%x\n", pv->pv_va);
 			continue;
 		}
 #endif
@@ -3111,7 +3120,7 @@ pmap_changebit(pa, bit, setem)
 
 #if defined(PMAP_DIAGNOSTIC)
 		if (!pv->pv_pmap) {
-			printf("Null pmap (cb) at va: 0x%lx\n", pv->pv_va);
+			printf("Null pmap (cb) at va: 0x%x\n", pv->pv_va);
 			continue;
 		}
 #endif
@@ -3512,11 +3521,10 @@ pmap_pvdump(pa)
 		pv;
 		pv = TAILQ_NEXT(pv, pv_list)) {
 #ifdef used_to_be
-		printf(" -> pmap %x, va %x, flags %x",
-		    pv->pv_pmap, pv->pv_va, pv->pv_flags);
+		printf(" -> pmap %p, va %x, flags %x",
+		    (void *)pv->pv_pmap, pv->pv_va, pv->pv_flags);
 #endif
-		printf(" -> pmap %x, va %x",
-		    pv->pv_pmap, pv->pv_va);
+		printf(" -> pmap %p, va %x", (void *)pv->pv_pmap, pv->pv_va);
 		pads(pv->pv_pmap);
 	}
 	printf(" ");