[kernel] r22769 - in dists/sid/linux/debian: . config config/armel

[Ben Hutchings]

Author: benh
Date: Sun Jun 21 02:45:37 2015
New Revision: 22769

Log:
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.

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

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Thu Jun 18 17:19:57 2015	(r22768)
+++ dists/sid/linux/debian/changelog	Sun Jun 21 02:45:37 2015	(r22769)
@@ -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 at decadent.org.uk>  Sun, 21 Jun 2015 03:30:39 +0100
+
 linux (4.0.5-1) unstable; urgency=medium
 
   * New upstream stable update:

Modified: dists/sid/linux/debian/config/armel/config-reduced
==============================================================================
--- dists/sid/linux/debian/config/armel/config-reduced	Thu Jun 18 17:19:57 2015	(r22768)
+++ dists/sid/linux/debian/config/armel/config-reduced	Sun Jun 21 02:45:37 2015	(r22769)
@@ -40,7 +40,6 @@
 #. Saves about 7K
 # CONFIG_COMPACTION is not set
 # CONFIG_KSM is not set
-# CONFIG_ZSMALLOC is not set
 
 ##
 ## file: net/Kconfig

Modified: dists/sid/linux/debian/config/config
==============================================================================
--- dists/sid/linux/debian/config/config	Thu Jun 18 17:19:57 2015	(r22768)
+++ dists/sid/linux/debian/config/config	Sun Jun 21 02:45:37 2015	(r22769)
@@ -5385,8 +5385,8 @@
 # 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
 
 ##