summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-generic2
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 78d91ec4b..fe2399bd8 100644
--- a/config-generic
+++ b/config-generic
@@ -4308,7 +4308,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_LOCKUP_DETECTOR=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_DETECT_HUNG_TASK is not set
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_ATOMIC64_SELFTEST=y
diff --git a/kernel.spec b/kernel.spec
index 2c610ee8f..3aa949799 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1882,6 +1882,9 @@ fi
# || ||
%changelog
+* Tue Sep 07 2010 Dave Jones <davej@redhat.com>
+- Disable hung task checker, it only ever causes false positives. (#630777)
+
* Tue Sep 07 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.17.rc3.git0
- Revert ce171780 which breaks my graphics on resume.
(drm/i915: Enable RC6 on Ironlake.)