mm: Update zfoo config

ZSWAP no longer selects ZBUD, but does still depend on it by default,
so we need to enable it explicitly.
Both ZBUD and ZSMALLOC are now tristate, so make them modules.
This also means ZSMALLOC doesn't need to be disabled on armel.

svn path=/dists/sid/linux/; revision=22769
This commit is contained in:
Ben Hutchings 2015-06-21 02:45:37 +00:00
parent ac767b0173
commit 15d2832b85
3 changed files with 9 additions and 3 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
linux (4.0.5-2) UNRELASED; urgency=medium
* mm: Re-enable ZBUD as module (Closes: #789094)
* mm: Change ZSMALLOC from built-in to module
-- Ben Hutchings <ben@decadent.org.uk> Sun, 21 Jun 2015 03:30:39 +0100
linux (4.0.5-1) unstable; urgency=medium
* New upstream stable update:

View File

@ -40,7 +40,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
#. Saves about 7K
# CONFIG_COMPACTION is not set
# CONFIG_KSM is not set
# CONFIG_ZSMALLOC is not set
##
## file: net/Kconfig

View File

@ -5385,8 +5385,8 @@ CONFIG_FRONTSWAP=y
# CONFIG_CMA is not set
CONFIG_MEM_SOFT_DIRTY=y
CONFIG_ZSWAP=y
# CONFIG_ZBUD is not set
CONFIG_ZSMALLOC=y
CONFIG_ZBUD=m
CONFIG_ZSMALLOC=m
# CONFIG_PGTABLE_MAPPING is not set
##