aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Attems <maks@debian.org>2010-01-26 16:10:13 +0000
committerMaximilian Attems <maks@debian.org>2010-01-26 16:10:13 +0000
commit38678952e034a564d312d83f5c60d134e56f5b99 (patch)
treed9f074266f2aa493650aa387ee0cfcf88896ed54
parent34cc7ba97993bb050a60d8ee359fbafb192848ce (diff)
downloadkernel_replicant_linux-38678952e034a564d312d83f5c60d134e56f5b99.tar.gz
kernel_replicant_linux-38678952e034a564d312d83f5c60d134e56f5b99.tar.bz2
kernel_replicant_linux-38678952e034a564d312d83f5c60d134e56f5b99.zip
topconfig set MEMORY_FAILURE
currently only available for x86. sparc will probably also get it. fedora enables it. adds page flag, see d466f2fcb32cd97fd586bfa33f5dba3ac78aadb0 and subsequent commits. svn path=/dists/trunk/linux-2.6/; revision=15003
-rw-r--r--debian/changelog3
-rw-r--r--debian/config/config1
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2592c61e41f8..7fb8430cfbd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,9 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
* [amd64] Make AGP support again built-in to fullfill the not completely
documented dependency with GART IOMMU support. (closes: #561552)
+ [ maximilian attems ]
+ * [topconfig] set MEMORY_FAILURE.
+
-- Ben Hutchings <ben@decadent.org.uk> Sun, 10 Jan 2010 17:38:50 +0000
linux-2.6 (2.6.32-5) unstable; urgency=low
diff --git a/debian/config/config b/debian/config/config
index 2c42920a066a..9834fb41df0f 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3332,6 +3332,7 @@ CONFIG_MEMORY_HOTREMOVE=y
CONFIG_MIGRATION=y
CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_MEMORY_FAILURE=y
##
## file: net/Kconfig