From 36a3ac3d3eb2549baed0b0168a9351b640df40ca Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 2 Oct 2010 23:28:34 +0000 Subject: [PATCH] Explicitly set LOCKUP_DETECTOR (enabled by default in 2.6.35, not any more) svn path=/dists/trunk/linux-2.6/; revision=16390 --- debian/changelog | 1 + debian/config/config | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 622129317..4d4f4f62d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux-2.6 (2.6.36~rc6-1~experimental.1) UNRELEASED; urgency=low to build-in yet. * Enable NETFILTER_XT_TARGET_CHECKSUM, NETFILTER_XT_TARGET_IDLETIMER, NETFILTER_XT_MATCH_CPU, NETFILTER_XT_MATCH_IPVS + * Reenable LOCKUP_DETECTOR, accidentally disabled by the previous version -- Ben Hutchings Sun, 26 Sep 2010 15:34:10 +0100 diff --git a/debian/config/config b/debian/config/config index b59546c22..329e8950d 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3520,6 +3520,7 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y +CONFIG_LOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_DETECT_HUNG_TASK=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set