[kernel] r16390 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Sat Oct  2 23:28:34 2010
New Revision: 16390

Log:
Explicitly set LOCKUP_DETECTOR (enabled by default in 2.6.35, not any more)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Oct  2 23:13:13 2010	(r16389)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Oct  2 23:28:34 2010	(r16390)
@@ -13,6 +13,7 @@
     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 <ben at decadent.org.uk>  Sun, 26 Sep 2010 15:34:10 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sat Oct  2 23:13:13 2010	(r16389)
+++ dists/trunk/linux-2.6/debian/config/config	Sat Oct  2 23:28:34 2010	(r16390)
@@ -3520,6 +3520,7 @@
 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