Sat Jun 20 13:10:14 2009 UTC ()
make this build with DEBUG_MEMLOAD in all combinations of 32bit, 32bit PAE and 64bit


(cegger)
diff -r1.31 -r1.32 src/sys/arch/x86/x86/x86_machdep.c

cvs diff -r1.31 -r1.32 src/sys/arch/x86/x86/x86_machdep.c (expand / switch to context diff)
--- src/sys/arch/x86/x86/x86_machdep.c 2009/03/21 15:01:57 1.31
+++ src/sys/arch/x86/x86/x86_machdep.c 2009/06/20 13:10:14 1.32
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_machdep.c,v 1.31 2009/03/21 15:01:57 ad Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.32 2009/06/20 13:10:14 cegger Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.31 2009/03/21 15:01:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.32 2009/06/20 13:10:14 cegger Exp $");
 
 #include "opt_modular.h"
 
@@ -714,9 +714,10 @@
 				if (tmp != seg_start) {
 #ifdef DEBUG_MEMLOAD
 					printf("loading 0x%"PRIx64"-0x%"PRIx64
-					    " (0x%lx-0x%lx)\n",
+					    " (0x%"PRIx64"-0x%"PRIx64")\n",
 					    seg_start, tmp,
-					    atop(seg_start), atop(tmp));
+					    (uint64_t)atop(seg_start),
+					    (uint64_t)atop(tmp));
 #endif
 					uvm_page_physload(atop(seg_start),
 					    atop(tmp), atop(seg_start),
@@ -728,9 +729,10 @@
 			if (seg_start != seg_end) {
 #ifdef DEBUG_MEMLOAD
 				printf("loading 0x%"PRIx64"-0x%"PRIx64
-				    " (0x%lx-0x%lx)\n",
+				    " (0x%"PRIx64"-0x%"PRIx64")\n",
 				    seg_start, seg_end,
-				    atop(seg_start), atop(seg_end));
+				    (uint64_t)atop(seg_start),
+				    (uint64_t)atop(seg_end));
 #endif
 				uvm_page_physload(atop(seg_start),
 				    atop(seg_end), atop(seg_start),
@@ -752,9 +754,10 @@
 				if (tmp != seg_start1) {
 #ifdef DEBUG_MEMLOAD
 					printf("loading 0x%"PRIx64"-0x%"PRIx64
-					    " (0x%lx-0x%lx)\n",
+					    " (0x%"PRIx64"-0x%"PRIx64")\n",
 					    seg_start1, tmp,
-					    atop(seg_start1), atop(tmp));
+					    (uint64_t)atop(seg_start1),
+					    (uint64_t)atop(tmp));
 #endif
 					uvm_page_physload(atop(seg_start1),
 					    atop(tmp), atop(seg_start1),
@@ -766,9 +769,10 @@
 			if (seg_start1 != seg_end1) {
 #ifdef DEBUG_MEMLOAD
 				printf("loading 0x%"PRIx64"-0x%"PRIx64
-				    " (0x%lx-0x%lx)\n",
+				    " (0x%"PRIx64"-0x%"PRIx64")\n",
 				    seg_start1, seg_end1,
-				    atop(seg_start1), atop(seg_end1));
+				    (uint64_t)atop(seg_start1),
+				    (uint64_t)atop(seg_end1));
 #endif
 				uvm_page_physload(atop(seg_start1),
 				    atop(seg_end1), atop(seg_start1),