[src/bouyer-quota2]: src Sync with HEAD

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4de5d56396d1
branches:  bouyer-quota2
changeset: 761140:4de5d56396d1
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Feb 09 10:55:13 2011 +0000

description:
Sync with HEAD

diffstat:

 distrib/sets/lists/base/shl.mi       |  5 +----
 sys/arch/x86/include/genfb_machdep.h |  3 ++-
 sys/arch/x86/x86/genfb_machdep.c     |  6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r 1afb7f7bc224 -r 4de5d56396d1 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Wed Feb 09 10:52:07 2011 +0000
+++ b/distrib/sets/lists/base/shl.mi    Wed Feb 09 10:55:13 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.569.2.1 2011/02/08 16:18:36 bouyer Exp $
+# $NetBSD: shl.mi,v 1.569.2.2 2011/02/09 10:55:13 bouyer Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -25,9 +25,6 @@
 ./lib/libdevmapper.so                          base-lvm-shlib          lvm,dynamicroot
 ./lib/libdevmapper.so.1                                base-lvm-shlib          lvm,dynamicroot
 ./lib/libdevmapper.so.1.0                      base-lvm-shlib          lvm,dynamicroot
-./lib/libdm.so                                 base-sys-shlib          dynamicroot
-./lib/libdm.so.0                               base-sys-shlib          dynamicroot
-./lib/libdm.so.0.0                             base-sys-shlib          dynamicroot
 ./lib/libedit.so                               base-sys-shlib          dynamicroot
 ./lib/libedit.so.3                             base-sys-shlib          dynamicroot
 ./lib/libedit.so.3.0                           base-sys-shlib          dynamicroot
diff -r 1afb7f7bc224 -r 4de5d56396d1 sys/arch/x86/include/genfb_machdep.h
--- a/sys/arch/x86/include/genfb_machdep.h      Wed Feb 09 10:52:07 2011 +0000
+++ b/sys/arch/x86/include/genfb_machdep.h      Wed Feb 09 10:55:13 2011 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 */
diff -r 1afb7f7bc224 -r 4de5d56396d1 sys/arch/x86/x86/genfb_machdep.c
--- a/sys/arch/x86/x86/genfb_machdep.c  Wed Feb 09 10:52:07 2011 +0000
+++ b/sys/arch/x86/x86/genfb_machdep.c  Wed Feb 09 10:55:13 2011 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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;