[kernel/f20] Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160)

[Josh Boyer]

commit 4f2dd823979364cbfc974c926c4ba0fc563d138b
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Thu Aug 28 10:38:28 2014 -0400

    Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160)

 Makefile         |    1 -
 Makefile.release |    1 -
 config-debug     |    1 -
 config-generic   |    1 +
 config-nodebug   |    1 -
 kernel.spec      |    3 +++
 6 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Makefile b/Makefile
index 178f4f2..90c8d2e 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_DEBUG_STACK_USAGE is not set/CONFIG_DEBUG_STACK_USAGE=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set/CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_LOCK_ALLOC is not set/CONFIG_DEBUG_LOCK_ALLOC=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_PROVE_LOCKING is not set/CONFIG_PROVE_LOCKING=y/' config-nodebug
diff --git a/Makefile.release b/Makefile.release
index ef0d66b..550fa95 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -11,7 +11,6 @@ config-release:
 	@perl -pi -e 's/CONFIG_DEBUG_STACK_USAGE=y/# CONFIG_DEBUG_STACK_USAGE is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y/# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_PROVE_LOCKING=y/# CONFIG_PROVE_LOCKING is not set/' config-nodebug
diff --git a/config-debug b/config-debug
index 6ad71f3..cc6abcc 100644
--- a/config-debug
+++ b/config-debug
@@ -5,7 +5,6 @@ CONFIG_SND_PCM_XRUN_DEBUG=y
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 
 CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_LOCK_TORTURE_TEST=m
diff --git a/config-generic b/config-generic
index a7098d4..b7bce08 100644
--- a/config-generic
+++ b/config-generic
@@ -4326,6 +4326,7 @@ CONFIG_HEADERS_CHECK=y
 # CONFIG_READABLE_ASM is not set
 
 # CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 
diff --git a/config-nodebug b/config-nodebug
index c6b4b79..abb4a94 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -5,7 +5,6 @@ CONFIG_SND_PCM_XRUN_DEBUG=y
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
diff --git a/kernel.spec b/kernel.spec
index 7e14d03..d56319e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2299,6 +2299,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Aug 28 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160)
+
 * Wed Aug 27 2014 Justin M. Forbes <jforbes at fedoraproject.org> - 3.15.10-201
 - CVE-2014-{5471,5472} isofs: Fix unbounded recursion when processing relocated
   directories (rhbz 1134099 1134101)