[kernel] r21751 - in dists/trunk/linux/debian: . config config/armel

[Ben Hutchings]

Author: benh
Date: Wed Aug 27 07:51:46 2014
New Revision: 21751

Log:
mm: Enable FRONTSWAP, ZSWAP (except armel/{ixp4xx,orion5x}) (Closes: #725703)

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/armel/config-reduced
   dists/trunk/linux/debian/config/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Wed Aug 27 07:41:59 2014	(r21750)
+++ dists/trunk/linux/debian/changelog	Wed Aug 27 07:51:46 2014	(r21751)
@@ -13,6 +13,8 @@
       (except on armel/kirkwood)
   * [powerpc] drm: Disable DRM_RADEON_UMS, as radeon X driver now requires KMS
   * aio: fix reqs_available handling (regression in 3.14.10)
+  * mm: Enable FRONTSWAP, ZSWAP (except armel/{ixp4xx,orion5x})
+    (Closes: #725703)
 
   [ Vagrant Cascadian ]
   * [armmp] Enable IMX_IPUV3_CORE (closes: #756810).

Modified: dists/trunk/linux/debian/config/armel/config-reduced
==============================================================================
--- dists/trunk/linux/debian/config/armel/config-reduced	Wed Aug 27 07:41:59 2014	(r21750)
+++ dists/trunk/linux/debian/config/armel/config-reduced	Wed Aug 27 07:51:46 2014	(r21751)
@@ -52,6 +52,7 @@
 ## file: mm/Kconfig
 ##
 # CONFIG_KSM is not set
+# CONFIG_FRONTSWAP is not set
 # CONFIG_ZSMALLOC is not set
 
 ##

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Wed Aug 27 07:41:59 2014	(r21750)
+++ dists/trunk/linux/debian/config/config	Wed Aug 27 07:51:46 2014	(r21751)
@@ -5006,8 +5006,9 @@
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 ## end choice
 # CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
+CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
+CONFIG_ZSWAP=y
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_ZSMALLOC=y
 # CONFIG_PGTABLE_MAPPING is not set