From 0de60bed72b6956afed8660845497d51c5825ab4 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Aug 28 2014 14:38:28 +0000
Subject: Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160)


---

diff --git a/Makefile b/Makefile
index e63bbf2..274ae2a 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,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_LOCK_TORTURE_TEST is not set/CONFIG_LOCK_TORTURE_TEST=m/' config-nodebug
diff --git a/Makefile.release b/Makefile.release
index 58a0117..6c79d4e 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -10,7 +10,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_LOCK_TORTURE_TEST=m/# CONFIG_LOCK_TORTURE_TEST is not set/' config-nodebug
diff --git a/config-debug b/config-debug
index 302280b..bc9ad26 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 1c9ed26..1958b04 100644
--- a/config-generic
+++ b/config-generic
@@ -4351,6 +4351,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 e16a37b..2990161 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 1eb01ff..f43ddd0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2276,6 +2276,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Aug 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160)
+
 * Wed Aug 27 2014 Justin M. Forbes <jforbes@fedoraproject.org>
 - CVE-2014-{5471,5472} isofs: Fix unbounded recursion when processing relocated
   directories (rhbz 1134099 1134101)