diff --git a/debian/changelog b/debian/changelog
index 665792fca..8dca1f803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ linux (4.9-1~exp1) UNRELEASED; urgency=medium
   * Set ABI to trunk
   * Enable USERFAULTFD (except on armel/marvell)
   * [x86] PCI: Enable VMD as module
+  * mm: Enable PAGE_POISONING (Closes: #849450), PAGE_POISONING_NO_SANITY
+    (except on armel/marvell)
 
   [ Uwe Kleine-König ]
   * enable `perf data' support; patch by Sebastian Andrzej Siewior
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index a40a577b1..4a8050699 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -718,6 +718,12 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_COMPACTION is not set
 # CONFIG_KSM is not set
 
+##
+## file: mm/Kconfig.debug
+##
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_PAGE_POISONING is not set
+
 ##
 ## file: net/Kconfig
 ##
diff --git a/debian/config/config b/debian/config/config
index 9782d9923..b4357485e 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5896,7 +5896,9 @@ CONFIG_ZSMALLOC=m
 ##
 ## file: mm/Kconfig.debug
 ##
-# CONFIG_PAGE_EXTENSION is not set
+CONFIG_PAGE_EXTENSION=y
+CONFIG_PAGE_POISONING=y
+CONFIG_PAGE_POISONING_NO_SANITY=y
 
 ##
 ## file: net/Kconfig