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

[Maximilian Attems]

Author: maks
Date: Tue Jan 26 23:06:49 2010
New Revision: 15022

Log:
topconfig set modular HWPOISON_INJECT

checkout Documentation / vm / hwpoison.txt for fun :)

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	Tue Jan 26 22:59:12 2010	(r15021)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jan 26 23:06:49 2010	(r15022)
@@ -66,7 +66,7 @@
   [ maximilian attems ]
   * [topconfig] set MEMORY_FAILURE, 9P_FSCACHE, INFINIBAND_IPOIB_CM
     (closes: #565494), ITCO_VENDOR_SUPPORT (closes: #525232), PCIEASPM
-    (closes: #545417).
+    (closes: #545417), HWPOISON_INJECT.
   * Enable easier debugging of Power Managment code. (closes: #478315)
   * Pass `DEB_MAINT_PARAMS' to hook scripts. (closes: #563161)
   * Enable more mobile IPv6 needs. (closes: #528834)

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Jan 26 22:59:12 2010	(r15021)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Jan 26 23:06:49 2010	(r15022)
@@ -3335,6 +3335,7 @@
 ## file: mm/Kconfig
 ##
 CONFIG_MEMORY_HOTPLUG=y
+CONFIG_HWPOISON_INJECT=m
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MIGRATION=y
 CONFIG_KSM=y