rpms/kernel/devel/configs config-generic, 1.159, 1.160 config-s390-generic, 1.11, 1.12 config-xen-generic, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv23869/configs

Modified Files:
	config-generic config-s390-generic config-xen-generic 
Log Message:
disable slab debug again



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- config-generic	11 Mar 2006 20:37:38 -0000	1.159
+++ config-generic	13 Mar 2006 21:05:33 -0000	1.160
@@ -2404,22 +2404,26 @@
 #
 CONFIG_DEBUG_KERNEL=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_HIGHMEM=y
 CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_FRAME_POINTER is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_BOOT_DELAY=y
 
 # Turn off these debug options for production kernels.
-CONFIG_DEBUG_SLAB=y
-CONFIG_DEBUG_SLAB_LEAK=y
+# CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_VM is not set
 
+# These debug options are deliberatly left on.
+# They aren't that much of a performance impact, and the value
+# from getting out-of-tree modules fixed is worth the trade-off.
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+CONFIG_BOOT_DELAY=y
+CONFIG_DEBUG_SLAB_LEAK=y
+
 #
 # Security options
 #


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-s390-generic	9 Feb 2006 21:45:33 -0000	1.11
+++ config-s390-generic	13 Mar 2006 21:05:33 -0000	1.12
@@ -144,13 +144,11 @@
 #
 # Kernel hacking
 #
-# The s390 used to blow up with slab debugging, recheck if it works now
-CONFIG_DEBUG_SLAB=y
 
 #
 # S390 specific stack options; needs gcc 3.5 so off for now
 #
-CONFIG_PACK_STACK=y 
+CONFIG_PACK_STACK=y
 # CONFIG_CHECK_STACK is not set
 # CONFIG_WARN_STACK is not set
 # CONFIG_SMALL_STACK is not set


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-xen-generic	10 Mar 2006 20:51:52 -0000	1.12
+++ config-xen-generic	13 Mar 2006 21:05:33 -0000	1.13
@@ -83,7 +83,7 @@
 
 #
 # Disabled until I figure out a way to make next_ram_page work
-# 
+#
 # CONFIG_NETDUMP is not set
 # CONFIG_DISKDUMP is not set