diff options
| author | Ben Hutchings <benh@debian.org> | 2014-08-27 07:51:46 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2014-08-27 07:51:46 +0000 |
| commit | c692bc729db7886c2852285d5c29610fda007f65 (patch) | |
| tree | 87996a210d8a6bc86bca9fcde95d04afa0f36795 | |
| parent | 8364adfe2568ac73d9a54d1a85262b3c2f8e9888 (diff) | |
| download | kernel_replicant_linux-c692bc729db7886c2852285d5c29610fda007f65.tar.gz kernel_replicant_linux-c692bc729db7886c2852285d5c29610fda007f65.tar.bz2 kernel_replicant_linux-c692bc729db7886c2852285d5c29610fda007f65.zip | |
mm: Enable FRONTSWAP, ZSWAP (except armel/{ixp4xx,orion5x}) (Closes: #725703)
svn path=/dists/trunk/linux/; revision=21751
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/config/armel/config-reduced | 1 | ||||
| -rw-r--r-- | debian/config/config | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 68251b7ae53b..88ab2f1012bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ linux (3.16.1-1) UNRELEASED; urgency=medium (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). diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced index 7658cb9e76a2..2b64af876333 100644 --- a/debian/config/armel/config-reduced +++ b/debian/config/armel/config-reduced @@ -52,6 +52,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y ## file: mm/Kconfig ## # CONFIG_KSM is not set +# CONFIG_FRONTSWAP is not set # CONFIG_ZSMALLOC is not set ## diff --git a/debian/config/config b/debian/config/config index 4793093a509e..84a8d75bc23f 100644 --- a/debian/config/config +++ b/debian/config/config @@ -5006,8 +5006,9 @@ CONFIG_TRANSPARENT_HUGEPAGE=y 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 |