From f761bb27bdbdedf5ff821efd920c4deb87707892 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Aug 26 2015 12:45:33 +0000
Subject: Enable SCHEDSTATS and LATENCYTOP again (rhbz 1013225)


---

diff --git a/Makefile.release b/Makefile.release
index f7b7042..fcd9081 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -82,7 +82,3 @@ config-release:
 
 	@# Change defaults back to sane things.
 	@perl -pi -e 's/CONFIG_MAXSMP=y/# CONFIG_MAXSMP is not set/' config-x86-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
-
diff --git a/config-debug b/config-debug
index fcc5aac..cfb1d38 100644
--- a/config-debug
+++ b/config-debug
@@ -126,5 +126,3 @@ CONFIG_EDAC_DEBUG=y
 CONFIG_SPI_DEBUG=y
 
 CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
-CONFIG_LATENCYTOP=y
-CONFIG_SCHEDSTATS=y
diff --git a/config-generic b/config-generic
index dfa69a6..bcee79c 100644
--- a/config-generic
+++ b/config-generic
@@ -4649,6 +4649,7 @@ 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_COMPAT_BRK is not set
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@@ -4863,6 +4864,7 @@ CONFIG_LCD_PLATFORM=m
 # CONFIG_LCD_LTV350QV is not set
 
 
+CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
diff --git a/config-nodebug b/config-nodebug
index 01008d6..15af3c7 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -126,7 +126,3 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 # CONFIG_SPI_DEBUG is not set
 
 # CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
-
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_LATENCYTOP is not set
-
diff --git a/kernel.spec b/kernel.spec
index 8d4db93..b12ec9f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2033,6 +2033,9 @@ fi
 #
 # 
 %changelog
+* Wed Aug 26 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable SCHEDSTATS and LATENCYTOP again (rhbz 1013225)
+
 * Mon Aug 24 2015 Peter Robinson <pbrobinson@fedoraproject.org>
 - Build in GPIO_OMAP to fix BeagleBone boot on mSD (changes in 4.2 upstream)