[Glibc-bsd-commits] r3967 - in trunk/kfreebsd-10/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sun Jan 8 14:56:46 UTC 2012
Author: rmh
Date: 2012-01-08 14:56:45 +0000 (Sun, 08 Jan 2012)
New Revision: 3967
Added:
trunk/kfreebsd-10/debian/patches/952_nodebug.diff
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/999_config.diff
trunk/kfreebsd-10/debian/patches/series
Log:
952_nodebug.diff: Disable full debugger support to minimize the impact of heisenbugs (see patch header for details).
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2012-01-08 01:11:44 UTC (rev 3966)
+++ trunk/kfreebsd-10/debian/changelog 2012-01-08 14:56:45 UTC (rev 3967)
@@ -2,8 +2,10 @@
* Remove 951_disable_mk_magic.diff (except for MK_CTF bits), build-depend
on freebsd-buildutils >= 9 instead.
+ * 952_nodebug.diff: Disable full debugger support to minimize the
+ impact of heisenbugs (see patch header for details).
- -- Robert Millan <rmh at debian.org> Sun, 08 Jan 2012 00:46:31 +0100
+ -- Robert Millan <rmh at debian.org> Sun, 08 Jan 2012 15:56:24 +0100
kfreebsd-10 (10.0~svn228940-1) experimental; urgency=low
Added: trunk/kfreebsd-10/debian/patches/952_nodebug.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/952_nodebug.diff (rev 0)
+++ trunk/kfreebsd-10/debian/patches/952_nodebug.diff 2012-01-08 14:56:45 UTC (rev 3967)
@@ -0,0 +1,50 @@
+
+Full debugger support is disabled by upstream when a branch is close to
+release. Unfortunately this can trigger the appearance of heisenbugs
+which were previously hidden (we've been hit by this already, see #651624).
+
+This patch disables full debugger support in advance, so that the build
+configuration which is going to be used for release is tested during the
+whole release cycle. If you need a debug kernel, simply remove/disable
+this patch.
+
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
+@@ -73,16 +73,7 @@
+ # Debugging support. Always need this:
+ options KDB # Enable kernel debugger support.
+ # For minimum debugger support (stable branch) use:
+-#options KDB_TRACE # Print a stack trace for a panic.
+-# For full debugger support use this instead:
+-options DDB # Support DDB.
+-options GDB # Support remote GDB.
+-options DEADLKRES # Enable the deadlock resolver
+-options INVARIANTS # Enable calls of extra sanity checking
+-options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+-options WITNESS # Enable checks to detect deadlocks and cycles
+-options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
+-options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
++options KDB_TRACE # Print a stack trace for a panic.
+
+ # Make an SMP-capable kernel by default
+ options SMP # Symmetric MultiProcessor Kernel
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
+@@ -73,16 +73,7 @@
+ # Debugging support. Always need this:
+ options KDB # Enable kernel debugger support.
+ # For minimum debugger support (stable branch) use:
+-#options KDB_TRACE # Print a stack trace for a panic.
+-# For full debugger support use this instead:
+-options DDB # Support DDB.
+-options GDB # Support remote GDB.
+-options DEADLKRES # Enable the deadlock resolver
+-options INVARIANTS # Enable calls of extra sanity checking
+-options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
+-options WITNESS # Enable checks to detect deadlocks and cycles
+-options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
+-options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
++options KDB_TRACE # Print a stack trace for a panic.
+
+ # To make an SMP kernel, the next two lines are needed
+ options SMP # Symmetric MultiProcessor Kernel
Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff 2012-01-08 01:11:44 UTC (rev 3966)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff 2012-01-08 14:56:45 UTC (rev 3967)
@@ -25,8 +25,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -85,7 +87,7 @@
- options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
+@@ -76,7 +78,7 @@
+ options KDB_TRACE # Print a stack trace for a panic.
# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
@@ -34,7 +34,7 @@
# CPU frequency control
device cpufreq
-@@ -94,9 +96,6 @@
+@@ -85,9 +87,6 @@
device acpi
device pci
@@ -44,7 +44,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -123,7 +122,6 @@
+@@ -114,7 +113,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -52,7 +52,7 @@
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -188,10 +186,6 @@
+@@ -179,10 +177,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -63,7 +63,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -202,8 +196,6 @@
+@@ -193,8 +187,6 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgbe # Intel PRO/10GbE PCIE Ethernet Family
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -72,7 +72,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -213,12 +205,10 @@
+@@ -204,12 +196,10 @@
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -85,7 +85,7 @@
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -228,7 +218,6 @@
+@@ -219,7 +209,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -93,7 +93,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -248,7 +237,6 @@
+@@ -239,7 +228,6 @@
device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
@@ -101,7 +101,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -268,12 +256,7 @@
+@@ -259,12 +247,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -114,7 +114,7 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
device wpi # Intel 3945ABG wireless NICs.
-@@ -282,11 +265,8 @@
+@@ -273,11 +256,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -126,7 +126,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -301,39 +281,9 @@
+@@ -292,39 +272,9 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
@@ -166,7 +166,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -344,15 +294,15 @@
+@@ -335,15 +285,15 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -230,8 +230,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -85,7 +89,7 @@
- options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
+@@ -76,7 +80,7 @@
+ options KDB_TRACE # Print a stack trace for a panic.
# To make an SMP kernel, the next two lines are needed
-options SMP # Symmetric MultiProcessor Kernel
@@ -239,7 +239,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -96,9 +100,6 @@
+@@ -87,9 +91,6 @@
device eisa
device pci
@@ -249,7 +249,7 @@
# ATA controllers
device ahci # AHCI-compatible SATA controllers
device ata # Legacy ATA/SATA controllers
-@@ -125,7 +126,6 @@
+@@ -116,7 +117,6 @@
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -257,7 +257,7 @@
device aha # Adaptec 154x SCSI adapters
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -198,10 +198,6 @@
+@@ -189,10 +189,6 @@
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -268,7 +268,7 @@
device puc # Multi I/O cards and multi-channel UARTs
-@@ -212,8 +208,6 @@
+@@ -203,8 +199,6 @@
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgb # Intel PRO/10GbE Ethernet Card
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -277,7 +277,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -223,12 +217,10 @@
+@@ -214,12 +208,10 @@
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -290,7 +290,7 @@
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -238,7 +230,6 @@
+@@ -229,7 +221,6 @@
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -298,7 +298,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -260,7 +251,6 @@
+@@ -251,7 +242,6 @@
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -306,7 +306,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -280,12 +270,7 @@
+@@ -271,12 +261,7 @@
device ath_rate_sample # SampleRate tx rate control for ath
#device bwi # Broadcom BCM430x/BCM431x wireless NICs.
#device bwn # Broadcom BCM43xx wireless NICs.
@@ -319,7 +319,7 @@
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
#device wl # Older non 802.11 Wavelan wireless NIC.
device wpi # Intel 3945ABG wireless NICs.
-@@ -295,11 +280,8 @@
+@@ -286,11 +271,8 @@
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -331,7 +331,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -314,39 +296,9 @@
+@@ -305,39 +287,9 @@
device ehci # EHCI PCI->USB interface (USB 2.0)
device xhci # XHCI PCI->USB interface (USB 3.0)
device usb # USB Bus (required)
@@ -371,7 +371,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -357,15 +309,15 @@
+@@ -348,15 +300,15 @@
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series 2012-01-08 01:11:44 UTC (rev 3966)
+++ trunk/kfreebsd-10/debian/patches/series 2012-01-08 14:56:45 UTC (rev 3967)
@@ -26,5 +26,6 @@
920_linux_cflags.diff
950_no_stack_protector.diff
951_disable_mk_magic.diff
+952_nodebug.diff
999_config.diff
999_firmware.diff
More information about the Glibc-bsd-commits
mailing list