From 448d79664f4ac7639852ca1f5a79cff4126889a7 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Aug 26 2011 20:15:58 +0000 Subject: Enable CONFIG_DETECT_HUNG_TASK for debug builds & rawhide. --- diff --git a/Makefile b/Makefile index 0b7442a..afa3992 100644 --- a/Makefile +++ b/Makefile @@ -93,6 +93,7 @@ debug: @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 @@ -172,6 +173,7 @@ release: @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 f58fef5..60931ff 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2034,6 +2034,9 @@ fi # || || %changelog * Fri Aug 26 2011 Dave Jones +- Enable CONFIG_DETECT_HUNG_TASK for debug builds & rawhide. + +* Fri Aug 26 2011 Dave Jones - 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)