From owner-svn-src-head@FreeBSD.ORG Mon Feb 15 23:44:49 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 685A71065676; Mon, 15 Feb 2010 23:44:49 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 557A68FC1A; Mon, 15 Feb 2010 23:44:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FNimiv049281; Mon, 15 Feb 2010 23:44:48 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1FNimLB049245; Mon, 15 Feb 2010 23:44:48 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201002152344.o1FNimLB049245@svn.freebsd.org> From: Attilio Rao Date: Mon, 15 Feb 2010 23:44:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203938 - in head/sys: amd64/conf arm/conf conf i386/conf ia64/conf mips/conf pc98/conf powerpc/conf sun4v/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2010 23:44:49 -0000 Author: attilio Date: Mon Feb 15 23:44:48 2010 New Revision: 203938 URL: http://svn.freebsd.org/changeset/base/203938 Log: Adjust style (following the already existing rules) for the newly introduced option DEADLKRES. Reported by: danfe, julian, avg Modified: head/sys/amd64/conf/GENERIC head/sys/amd64/conf/XENHVM head/sys/arm/conf/AVILA head/sys/arm/conf/BWCT head/sys/arm/conf/CAMBRIA head/sys/arm/conf/CNS11XXNAS head/sys/arm/conf/CRB head/sys/arm/conf/DB-88F5XXX head/sys/arm/conf/DB-88F6XXX head/sys/arm/conf/EP80219 head/sys/arm/conf/GUMSTIX head/sys/arm/conf/HL200 head/sys/arm/conf/IQ31244 head/sys/arm/conf/KB920X head/sys/arm/conf/NSLU head/sys/arm/conf/SKYEYE head/sys/conf/NOTES head/sys/i386/conf/GENERIC head/sys/i386/conf/XEN head/sys/ia64/conf/GENERIC head/sys/mips/conf/ADM5120 head/sys/mips/conf/ALCHEMY head/sys/mips/conf/IDT head/sys/mips/conf/MALTA head/sys/mips/conf/MALTA64 head/sys/mips/conf/OCTEON1 head/sys/mips/conf/OCTEON1-32 head/sys/mips/conf/QEMU head/sys/mips/conf/SENTRY5 head/sys/mips/conf/SWARM head/sys/mips/conf/XLR head/sys/pc98/conf/GENERIC head/sys/powerpc/conf/GENERIC head/sys/powerpc/conf/MPC85XX head/sys/sun4v/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/amd64/conf/GENERIC Mon Feb 15 23:44:48 2010 (r203938) @@ -72,7 +72,7 @@ options INCLUDE_CONFIG_FILE # Inclu options KDB # Enable kernel debugger support. options DDB # Support DDB. options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver +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 Modified: head/sys/amd64/conf/XENHVM ============================================================================== --- head/sys/amd64/conf/XENHVM Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/amd64/conf/XENHVM Mon Feb 15 23:44:48 2010 (r203938) @@ -70,7 +70,7 @@ options NO_ADAPTIVE_RWLOCKS options KDB # Enable kernel debugger support. options DDB # Support DDB. options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver +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 Modified: head/sys/arm/conf/AVILA ============================================================================== --- head/sys/arm/conf/AVILA Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/AVILA Mon Feb 15 23:44:48 2010 (r203938) @@ -39,7 +39,7 @@ options DEVICE_POLLING options KDB #options GDB options DDB #Enable the kernel debugger -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/BWCT ============================================================================== --- head/sys/arm/conf/BWCT Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/BWCT Mon Feb 15 23:44:48 2010 (r203938) @@ -79,7 +79,7 @@ device mii device rlswitch # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/CAMBRIA ============================================================================== --- head/sys/arm/conf/CAMBRIA Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/CAMBRIA Mon Feb 15 23:44:48 2010 (r203938) @@ -39,7 +39,7 @@ options DEVICE_POLLING options KDB #options GDB options DDB #Enable the kernel debugger -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/CNS11XXNAS ============================================================================== --- head/sys/arm/conf/CNS11XXNAS Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/CNS11XXNAS Mon Feb 15 23:44:48 2010 (r203938) @@ -39,7 +39,7 @@ options DEVICE_POLLING options KDB #options GDB options DDB #Enable the kernel debugger -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/CRB ============================================================================== --- head/sys/arm/conf/CRB Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/CRB Mon Feb 15 23:44:48 2010 (r203938) @@ -93,7 +93,7 @@ device pty # Debugging for use in -current options KDB options DDB #Enable the kernel debugger -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/DB-88F5XXX ============================================================================== --- head/sys/arm/conf/DB-88F5XXX Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/DB-88F5XXX Mon Feb 15 23:44:48 2010 (r203938) @@ -39,7 +39,7 @@ options NO_SWAPPING # Debugging options ALT_BREAK_TO_DEBUGGER options DDB -#options DEADLKRES #Enable the deadlock resolver +#options DEADLKRES #Enable the deadlock resolver options DIAGNOSTIC #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS Modified: head/sys/arm/conf/DB-88F6XXX ============================================================================== --- head/sys/arm/conf/DB-88F6XXX Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/DB-88F6XXX Mon Feb 15 23:44:48 2010 (r203938) @@ -39,7 +39,7 @@ options NO_SWAPPING # Debugging options ALT_BREAK_TO_DEBUGGER options DDB -#options DEADLKRES #Enable the deadlock resolver +#options DEADLKRES #Enable the deadlock resolver options DIAGNOSTIC #options INVARIANTS #Enable calls of extra sanity checking #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS Modified: head/sys/arm/conf/EP80219 ============================================================================== --- head/sys/arm/conf/EP80219 Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/EP80219 Mon Feb 15 23:44:48 2010 (r203938) @@ -89,7 +89,7 @@ device dma # I80321 DMA Controller # Debugging for use in -current options KDB options DDB #Enable the kernel debugger -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/GUMSTIX ============================================================================== --- head/sys/arm/conf/GUMSTIX Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/GUMSTIX Mon Feb 15 23:44:48 2010 (r203938) @@ -80,7 +80,7 @@ device pty # Debugging for use in -current options KDB options DDB #Enable the kernel debugger -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/HL200 ============================================================================== --- head/sys/arm/conf/HL200 Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/HL200 Mon Feb 15 23:44:48 2010 (r203938) @@ -74,7 +74,7 @@ device mii device lxtphy # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/IQ31244 ============================================================================== --- head/sys/arm/conf/IQ31244 Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/IQ31244 Mon Feb 15 23:44:48 2010 (r203938) @@ -94,7 +94,7 @@ device "iq31244_7seg" # IQ31244 7 seg # Debugging for use in -current options KDB options DDB #Enable the kernel debugger -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/KB920X ============================================================================== --- head/sys/arm/conf/KB920X Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/KB920X Mon Feb 15 23:44:48 2010 (r203938) @@ -75,7 +75,7 @@ device mii device lxtphy # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/NSLU ============================================================================== --- head/sys/arm/conf/NSLU Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/NSLU Mon Feb 15 23:44:48 2010 (r203938) @@ -44,7 +44,7 @@ options DEVICE_POLLING options KDB #options GDB options DDB #Enable the kernel debugger -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/arm/conf/SKYEYE ============================================================================== --- head/sys/arm/conf/SKYEYE Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/arm/conf/SKYEYE Mon Feb 15 23:44:48 2010 (r203938) @@ -68,7 +68,7 @@ device uart # output. Adds ~215k to driver. # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/conf/NOTES Mon Feb 15 23:44:48 2010 (r203938) @@ -2547,7 +2547,7 @@ options SW_WATCHDOG # # Add the software deadlock resolver thread. # -options DEADLKRES +options DEADLKRES # # Disable swapping of stack pages. This option removes all Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/i386/conf/GENERIC Mon Feb 15 23:44:48 2010 (r203938) @@ -72,7 +72,7 @@ options INCLUDE_CONFIG_FILE # Inclu options KDB # Enable kernel debugger support. options DDB # Support DDB. options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver +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 Modified: head/sys/i386/conf/XEN ============================================================================== --- head/sys/i386/conf/XEN Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/i386/conf/XEN Mon Feb 15 23:44:48 2010 (r203938) @@ -49,7 +49,7 @@ options AUDIT # Security event auditi options KDB # Enable kernel debugger support. options DDB # Support DDB. options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver +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 Modified: head/sys/ia64/conf/GENERIC ============================================================================== --- head/sys/ia64/conf/GENERIC Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/ia64/conf/GENERIC Mon Feb 15 23:44:48 2010 (r203938) @@ -31,7 +31,7 @@ options COMPAT_43TTY # BSD 4.3 TTY comp options COMPAT_FREEBSD6 # Compatible with FreeBSD6 options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options DDB # Support DDB -options DEADLKRES # Enable the deadlock resolver +options DEADLKRES # Enable the deadlock resolver options FFS # Berkeley Fast Filesystem options GDB # Support remote GDB options GEOM_LABEL # Provides labelization Modified: head/sys/mips/conf/ADM5120 ============================================================================== --- head/sys/mips/conf/ADM5120 Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/ADM5120 Mon Feb 15 23:44:48 2010 (r203938) @@ -55,7 +55,7 @@ options BOOTP_COMPAT options ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\" # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/mips/conf/ALCHEMY ============================================================================== --- head/sys/mips/conf/ALCHEMY Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/ALCHEMY Mon Feb 15 23:44:48 2010 (r203938) @@ -55,7 +55,7 @@ options ROOTDEVNAME=\"nfs:10.0.0.1:/mnt # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/mips/conf/IDT ============================================================================== --- head/sys/mips/conf/IDT Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/IDT Mon Feb 15 23:44:48 2010 (r203938) @@ -27,7 +27,7 @@ options BOOTP_WIRED_TO=kr0 options BOOTP_COMPAT # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/mips/conf/MALTA ============================================================================== --- head/sys/mips/conf/MALTA Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/MALTA Mon Feb 15 23:44:48 2010 (r203938) @@ -58,7 +58,7 @@ options ROOTDEVNAME=\"ufs:ad0s1a\" # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/mips/conf/MALTA64 ============================================================================== --- head/sys/mips/conf/MALTA64 Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/MALTA64 Mon Feb 15 23:44:48 2010 (r203938) @@ -59,7 +59,7 @@ options ROOTDEVNAME=\"ufs:ad0s1a\" # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/mips/conf/OCTEON1 ============================================================================== --- head/sys/mips/conf/OCTEON1 Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/OCTEON1 Mon Feb 15 23:44:48 2010 (r203938) @@ -67,7 +67,7 @@ options UFS_DIRHASH # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/mips/conf/OCTEON1-32 ============================================================================== --- head/sys/mips/conf/OCTEON1-32 Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/OCTEON1-32 Mon Feb 15 23:44:48 2010 (r203938) @@ -56,7 +56,7 @@ options UFS_DIRHASH # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/mips/conf/QEMU ============================================================================== --- head/sys/mips/conf/QEMU Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/QEMU Mon Feb 15 23:44:48 2010 (r203938) @@ -43,7 +43,7 @@ options PSEUDOFS #Pseudo-filesystem fr options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/mips/conf/SENTRY5 ============================================================================== --- head/sys/mips/conf/SENTRY5 Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/SENTRY5 Mon Feb 15 23:44:48 2010 (r203938) @@ -56,7 +56,7 @@ options PSEUDOFS #Pseudo-filesystem fr options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # Debugging for use in -current -#options DEADLKRES +#options DEADLKRES options INVARIANTS options INVARIANT_SUPPORT Modified: head/sys/mips/conf/SWARM ============================================================================== --- head/sys/mips/conf/SWARM Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/SWARM Mon Feb 15 23:44:48 2010 (r203938) @@ -47,7 +47,7 @@ options PSEUDOFS #Pseudo-filesystem fr options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions # Debugging for use in -current -#options DEADLKRES +#options DEADLKRES options INVARIANTS options INVARIANT_SUPPORT options WITNESS Modified: head/sys/mips/conf/XLR ============================================================================== --- head/sys/mips/conf/XLR Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/mips/conf/XLR Mon Feb 15 23:44:48 2010 (r203938) @@ -96,7 +96,7 @@ options DDB options KDB options GDB options ALT_BREAK_TO_DEBUGGER -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/pc98/conf/GENERIC ============================================================================== --- head/sys/pc98/conf/GENERIC Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/pc98/conf/GENERIC Mon Feb 15 23:44:48 2010 (r203938) @@ -72,7 +72,7 @@ options INCLUDE_CONFIG_FILE # Inclu options KDB # Enable kernel debugger support. options DDB # Support DDB. options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver +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 Modified: head/sys/powerpc/conf/GENERIC ============================================================================== --- head/sys/powerpc/conf/GENERIC Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/powerpc/conf/GENERIC Mon Feb 15 23:44:48 2010 (r203938) @@ -68,7 +68,7 @@ options INCLUDE_CONFIG_FILE # Inclu # Debugging for use in -current options KDB #Enable the kernel debugger options DDB #Support DDB -#options DEADLKRES #Enable the deadlock resolver +#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 Modified: head/sys/powerpc/conf/MPC85XX ============================================================================== --- head/sys/powerpc/conf/MPC85XX Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/powerpc/conf/MPC85XX Mon Feb 15 23:44:48 2010 (r203938) @@ -22,7 +22,7 @@ options BOOTP_WIRED_TO=tsec0 options CD9660 options COMPAT_43 options DDB -#options DEADLKRES +#options DEADLKRES options DEVICE_POLLING options HZ=1000 #options DIAGNOSTIC Modified: head/sys/sun4v/conf/GENERIC ============================================================================== --- head/sys/sun4v/conf/GENERIC Mon Feb 15 21:40:25 2010 (r203937) +++ head/sys/sun4v/conf/GENERIC Mon Feb 15 23:44:48 2010 (r203938) @@ -75,7 +75,7 @@ options DDB # Support DDB. #options TRAP_TRACING # Enable trap tracing. #options TRAP_TRACE_ENTRIES=256 # Trap trace buffer entries. #options GDB # Support remote GDB. -#options DEADLKRES # Enable the deadlock resolver +#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