From 882a70be5e24e13fac253bda5f6a6d9c17b7d9ef Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@debian.org>
Date: Fri, 19 Dec 2014 08:54:04 +0000
Subject: [PATCH] [armel/kirkwood] mm: Disable KSM

svn path=/dists/sid/linux/; revision=22205
---
 debian/changelog                    | 1 +
 debian/config/armel/config.kirkwood | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a6bce3b28..4314c9419 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ linux (3.16.7-ckt2-2) UNRELEASED; urgency=medium
     - Warn if image size leaves less than 1% spare capacity in the flash. This
       allows some slack for growth over the lifetime of a stable release.
     - [/kirkwood] Disable RD_LZO and RD_LZ4
+    - [/kirkwood] mm: Disable KSM
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 13 Dec 2014 11:45:48 +0000
 
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 1b6a92d56..32ae29d3e 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -641,6 +641,7 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
+# CONFIG_KSM is not set
 
 ##
 ## file: net/atm/Kconfig