diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-26 08:45:33 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-26 08:45:33 -0400 |
| commit | f761bb27bdbdedf5ff821efd920c4deb87707892 (patch) | |
| tree | b03dc69607f5ecdd521855c812916066ba4c85a1 | |
| parent | 5969c87ac95b4f85a579f2cc821900b5aa8b569b (diff) | |
| download | kernel-f761bb27bdbdedf5ff821efd920c4deb87707892.tar.gz kernel-f761bb27bdbdedf5ff821efd920c4deb87707892.tar.xz kernel-f761bb27bdbdedf5ff821efd920c4deb87707892.zip | |
Enable SCHEDSTATS and LATENCYTOP again (rhbz 1013225)
| -rw-r--r-- | Makefile.release | 4 | ||||
| -rw-r--r-- | config-debug | 2 | ||||
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | config-nodebug | 4 | ||||
| -rw-r--r-- | kernel.spec | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.release b/Makefile.release index f7b704237..fcd90814f 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 fcc5aac03..cfb1d380b 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 dfa69a6cf..bcee79c0c 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 01008d646..15af3c7a1 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 8d4db9323..b12ec9f55 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) |