[kernel/f16] Enable CONFIG_DETECT_HUNG_TASK for debug builds & rawhide.

[Dave Jones]

commit ad3c6818fc663b6399c1eb5f112347369a897a47
Author: Dave Jones <davej at redhat.com>
Date:   Fri Aug 26 16:17:39 2011 -0400

    Enable CONFIG_DETECT_HUNG_TASK for debug builds & rawhide.
    
    Also sync Makefile with master/

 Makefile       |    4 ++++
 config-debug   |    5 +++++
 config-generic |    1 -
 config-nodebug |    5 +++++
 kernel.spec    |    3 +++
 5 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/Makefile b/Makefile
index cffc926..afa3992 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,8 @@ debug:
 	@perl -pi -e 's/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_PER_CPU_MAPS is not set/CONFIG_DEBUG_PER_CPU_MAPS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_TEST_LIST_SORT is not set/CONFIG_TEST_LIST_SORT=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_ATOMIC_SLEEP is not set/CONFIG_DEBUG_ATOMIC_SLEEP=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DETECT_HUNG_TASK is not set/CONFIG_DETECT_HUNG_TASK=y/' config-nodebug
 
 	@perl -pi -e 's/# CONFIG_DEBUG_SET_MODULE_RONX is not set/CONFIG_DEBUG_SET_MODULE_RONX=y/' config-nodebug
 
@@ -170,6 +172,8 @@ release:
 	#@perl -pi -e 's/CONFIG_KDB_KEYBOARD=y/# CONFIG_KDB_KEYBOARD is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_PER_CPU_MAPS=y/# CONFIG_DEBUG_PER_CPU_MAPS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_TEST_LIST_SORT=y/# CONFIG_TEST_LIST_SORT is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_ATOMIC_SLEEP=y/# CONFIG_DEBUG_ATOMIC_SLEEP is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DETECT_HUNG_TASK=y/# CONFIG_DETECT_HUNG_TASK is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_DEBUG_SET_MODULE_RONX=y/# CONFIG_DEBUG_SET_MODULE_RONX is not set/' config-nodebug
 
diff --git a/config-debug b/config-debug
index 21e52bf..c5cd5b3 100644
--- a/config-debug
+++ b/config-debug
@@ -100,3 +100,8 @@ CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
 CONFIG_TEST_LIST_SORT=y
 
 CONFIG_DEBUG_SET_MODULE_RONX=y
+
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+
diff --git a/config-generic b/config-generic
index 38e0900..e37094a 100644
--- a/config-generic
+++ b/config-generic
@@ -4617,7 +4617,6 @@ CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-# CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_ATOMIC64_SELFTEST=y
 
diff --git a/config-nodebug b/config-nodebug
index a3fbf94..2ec48fe 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -100,3 +100,8 @@ CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
 CONFIG_TEST_LIST_SORT=y
 
 CONFIG_DEBUG_SET_MODULE_RONX=y
+
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+
diff --git a/kernel.spec b/kernel.spec
index 83004f0..88b80cd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2033,6 +2033,9 @@ fi
 
 %changelog
 * Fri Aug 26 2011 Dave Jones <davej at redhat.com>
+- Enable CONFIG_DETECT_HUNG_TASK for debug builds & rawhide.
+
+* Fri Aug 26 2011 Dave Jones <davej at redhat.com>
 - Drop linux-2.6-debug-vm-would-have-oomkilled.patch
   The oom-killer heuristics have improved enough that this should
   never be necessary (and it probably doesn't dtrt any more)