aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Attems <maks@debian.org>2010-01-26 23:06:49 +0000
committerMaximilian Attems <maks@debian.org>2010-01-26 23:06:49 +0000
commitcfe445f5bb2aafc510fb699c24a951e9ebb47de2 (patch)
tree624efecc7ff3604eeef621fe72c2aa8813d62b30
parent182c7b1e03cbc6278769b4118287400fca7cc8f3 (diff)
downloadkernel_replicant_linux-cfe445f5bb2aafc510fb699c24a951e9ebb47de2.tar.gz
kernel_replicant_linux-cfe445f5bb2aafc510fb699c24a951e9ebb47de2.tar.bz2
kernel_replicant_linux-cfe445f5bb2aafc510fb699c24a951e9ebb47de2.zip
topconfig set modular HWPOISON_INJECT
checkout Documentation / vm / hwpoison.txt for fun :) svn path=/dists/trunk/linux-2.6/; revision=15022
-rw-r--r--debian/changelog2
-rw-r--r--debian/config/config1
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3353f557318d..11bb356cca54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,7 +66,7 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
[ 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)
diff --git a/debian/config/config b/debian/config/config
index 287140cc14c0..a5aa905343ec 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3335,6 +3335,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
## file: mm/Kconfig
##
CONFIG_MEMORY_HOTPLUG=y
+CONFIG_HWPOISON_INJECT=m
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_MIGRATION=y
CONFIG_KSM=y