Module Name: src
Committed By: sborrill
Date: Sat Feb 25 21:39:08 UTC 2012
Modified Files:
src/sys/arch/amd64/conf [netbsd-6]: XEN3_DOM0
src/sys/arch/i386/conf [netbsd-6]: XEN3_DOM0
Log Message:
Remainder of pullup request:
Pull up the following revisions(s) (requested by bouyer in ticket #52):
sys/arch/amd64/conf/XEN3_DOM0: revision 1.79-1.80
sys/arch/i386/conf/XEN3_DOM0: revision 1.62-1.63
Comment out MPDEBUG, ACPIVERBOSE and MPVERBOSE.
To generate a diff of this commit:
cvs rdiff -u -r1.77.2.1 -r1.77.2.2 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.60.2.1 -r1.60.2.2 src/sys/arch/i386/conf/XEN3_DOM0
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/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.1 src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.2
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.1 Sat Feb 25 21:18:01 2012
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Feb 25 21:39:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.77.2.1 2012/02/25 21:18:01 sborrill Exp $
+# $NetBSD: XEN3_DOM0,v 1.77.2.2 2012/02/25 21:39:07 sborrill Exp $
include "arch/amd64/conf/std.xen"
@@ -214,11 +214,11 @@ acpi0 at hypervisor?
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
options ACPI_SCANPCI # find PCI roots using ACPI
#options ACPICA_PEDANTIC # force strict conformance to the Spec.
-options ACPIVERBOSE # verbose ACPI configuration messages
+#options ACPIVERBOSE # verbose ACPI configuration messages
#options MIIVERBOSE # verbose PHY autoconfig messages
options MPBIOS # configure CPUs and APICs using MPBIOS
-options MPDEBUG # MPBIOS configures PCI roots
-options MPVERBOSE # verbose MPBIOS autoconfig messages
+#options MPDEBUG # MPBIOS configures PCI roots
+#options MPVERBOSE # verbose MPBIOS autoconfig messages
options MPBIOS_SCANPCI # MPBIOS configures PCI roots
#options PCI_ADDR_FIXUP # fixup PCI I/O addresses
#options PCI_BUS_FIXUP # fixup PCI bus numbering
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.1 src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.2
--- src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.1 Sat Feb 25 21:18:02 2012
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Feb 25 21:39:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.60.2.1 2012/02/25 21:18:02 sborrill Exp $
+# $NetBSD: XEN3_DOM0,v 1.60.2.2 2012/02/25 21:39:07 sborrill Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -836,9 +836,9 @@ pciback* at pci? #pci backend device
acpi0 at hypervisor?
options MPBIOS
-options MPDEBUG
-options MPVERBOSE
-options ACPIVERBOSE
+#options MPDEBUG
+#options MPVERBOSE
+#options ACPIVERBOSE
#options PCI_ADDR_FIXUP # fixup PCI I/O addresses
#options PCI_BUS_FIXUP # fixup PCI bus numbering
#options PCI_INTR_FIXUP # fixup PCI interrupt routing
