Disable LATENCYTOP/SCHEDSTATS in non-debug builds.

Makefile.release

@@ -79,3 +79,7 @@ config-release:
 
 	@# Disable UAS for release until it's ready. (#717633, #744099)
 	@perl -pi -e 's/CONFIG_USB_UAS=m/# CONFIG_USB_UAS is not set/' config-generic
+
+	@perl -pi -e 's/CONFIG_SCHEDSTATS=y/# CONFIG_SCHEDSTATS is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_LATENCYTOP=y/# CONFIG_LATENCYTOP is not set/' config-nodebug
+

config-debug

@@ -115,3 +115,5 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 CONFIG_MAC80211_MESSAGE_TRACING=y
 
 CONFIG_EDAC_DEBUG=y
+CONFIG_LATENCYTOP=y
+CONFIG_SCHEDSTATS=y

config-generic

@@ -3958,7 +3958,6 @@ CONFIG_HWPOISON_INJECT=m
 CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_LATENCYTOP=y
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_DEBUG_VIRTUAL is not set
@@ -4126,7 +4125,6 @@ CONFIG_BACKLIGHT_LP855X=m
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
 
-CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y

config-nodebug

@@ -117,3 +117,5 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 # CONFIG_EDAC_DEBUG is not set
 
 # CONFIG_SPI_DEBUG is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SCHEDSTATS is not set

kernel.spec

@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 303
+%global baserelease 304
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2420,6 +2420,9 @@ fi
 # and build.
 
 %changelog
+* Fri Jul 12 2013 Dave Jones <davej@redhat.com> - 3.9.9-304
+- Disable LATENCYTOP/SCHEDSTATS in non-debug builds.
+
 * Fri Jul 12 2013 Josh Boyer <jwboyer@redhat.com>
 - Fix various overflow issues in ext4 (rhbz 976837)
 - Add iwlwifi fix for connection issue (rhbz 885407)