rpms/kernel/devel Makefile, 1.107, 1.108 config-debug, 1.28, 1.29 config-generic, 1.312, 1.313 config-nodebug, 1.37, 1.38

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2510

Modified Files:
	Makefile config-debug config-generic config-nodebug 
Log Message:
- Don't diddle with kobject debugging during make debug/release
- Group more of the kernel debugging options in config-generic
- Add some commentary



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- Makefile	24 Jul 2009 18:24:27 -0000	1.107
+++ Makefile	27 Jul 2009 17:42:03 -0000	1.108
@@ -72,7 +72,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_KOBJECT is not set/CONFIG_DEBUG_KOBJECT=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -119,7 +118,6 @@ release:
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_KOBJECT=y/# CONFIG_DEBUG_KOBJECT is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- config-debug	27 Jul 2009 17:17:24 -0000	1.28
+++ config-debug	27 Jul 2009 17:42:04 -0000	1.29
@@ -50,5 +50,3 @@ CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DMA_API_DEBUG=y
 
 CONFIG_MMIOTRACE=y
-
-CONFIG_DEBUG_KOBJECT=n


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- config-generic	24 Jul 2009 18:24:28 -0000	1.312
+++ config-generic	27 Jul 2009 17:42:04 -0000	1.313
@@ -16,7 +16,6 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
 CONFIG_BUILD_DOCSRC=y
-CONFIG_DYNAMIC_DEBUG=y
 
 #
 # General setup
@@ -3357,22 +3356,6 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 CONFIG_KGDB_TESTS=y
 # CONFIG_KGDB_TESTS_ON_BOOT 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_SLEEP=y
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DEBUG_SLAB_LEAK=y
-CONFIG_DEBUG_LIST=y
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_DEBUG_DEVRES=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-
-CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_NX_TEST=m
-CONFIG_DEBUG_BOOT_PARAMS=y
-
 #
 # Security options
 #
@@ -3521,12 +3504,9 @@ CONFIG_PROC_PID_CPUSET=y
 
 CONFIG_RELAY=y
 # CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
 
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
 
 CONFIG_KEXEC=y
 
@@ -4037,5 +4017,30 @@ CONFIG_PPS=m
 # CONFIG_RDC_17F3101X is not set
 # CONFIG_FB_UDL is not set
 
+# DEBUG options that don't get enabled/disabled with 'make debug/release'
+#
+# Kmemleak still produces a lot of false positives.
 # CONFIG_DEBUG_KMEMLEAK is not set
+#
+# This generates a huge amount of dmesg spew
+# CONFIG_DEBUG_KOBJECT is not set
+#
+#
+# These debug options are deliberatly left on (even in 'make release' kernels).
+# They aren't that much of a performance impact, and the value
+# from getting useful bug-reports makes it worth leaving them on.
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
+CONFIG_DEBUG_RODATA_TEST=y
+CONFIG_DEBUG_NX_TEST=m
+CONFIG_DEBUG_BOOT_PARAMS=y
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- config-nodebug	27 Jul 2009 17:17:24 -0000	1.37
+++ config-nodebug	27 Jul 2009 17:42:04 -0000	1.38
@@ -49,5 +49,3 @@ CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DMA_API_DEBUG=y
 
 CONFIG_MMIOTRACE=y
-
-CONFIG_DEBUG_KOBJECT=n