CVS commit: [bouyer-quota2] src/sys/arch/x86

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Wed Feb  9 11:00:08 UTC 2011

Modified Files:
        src/sys/arch/x86/include [bouyer-quota2]: genfb_machdep.h
        src/sys/arch/x86/x86 [bouyer-quota2]: genfb_machdep.c

Log Message:
Sync with HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/arch/x86/include/genfb_machdep.h
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/arch/x86/x86/genfb_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/x86/include/genfb_machdep.h
diff -u src/sys/arch/x86/include/genfb_machdep.h:1.1 src/sys/arch/x86/include/genfb_machdep.h:1.1.14.1
--- src/sys/arch/x86/include/genfb_machdep.h:1.1	Tue Feb 17 01:42:52 2009
+++ src/sys/arch/x86/include/genfb_machdep.h	Wed Feb  9 11:00:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.h,v 1.1 2009/02/17 01:42:52 jmcneill Exp $ */
+/* $NetBSD: genfb_machdep.h,v 1.1.14.1 2011/02/09 11:00:07 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,5 +30,6 @@
 #define _X86_GENFB_MACHDEP_H
 
 int	x86_genfb_cnattach(void);
+void	x86_genfb_mtrr_init(uint64_t, uint32_t);
 
 #endif /* !_X86_GENFB_MACHDEP_H */

Index: src/sys/arch/x86/x86/genfb_machdep.c
diff -u src/sys/arch/x86/x86/genfb_machdep.c:1.4.4.1 src/sys/arch/x86/x86/genfb_machdep.c:1.4.4.2
--- src/sys/arch/x86/x86/genfb_machdep.c:1.4.4.1	Tue Feb  8 16:19:45 2011
+++ src/sys/arch/x86/x86/genfb_machdep.c	Wed Feb  9 11:00:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.c,v 1.4.4.1 2011/02/08 16:19:45 bouyer Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.4.4.2 2011/02/09 11:00:08 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.4.4.1 2011/02/08 16:19:45 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.4.4.2 2011/02/09 11:00:08 bouyer Exp $");
 
 #include "opt_mtrr.h"
 
@@ -92,7 +92,7 @@
 	mtrr.flags = MTRR_VALID;
 	mtrr.owner = 0;
 
-	aprint_debug("%s: 0x%llx-0x%llx\n", __func__,
+	aprint_debug("%s: 0x%" PRIx64 "-0x%" PRIx64 "\n", __func__,
 	    mtrr.base, mtrr.base + mtrr.len - 1);
 
 	n = 1;