mm: Enable ZSMALLOC as built-in, ZRAM as module (Closes: #676779)

These have been promoted out of staging so hopefully they're really
portable now.

Keep them disabled on armel/{ixp4xx,orion5x} due to size constraints.

svn path=/dists/trunk/linux/; revision=21127

debian/changelog

@@ -2,6 +2,10 @@ linux (3.14~rc5-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
 
+  [ Ben Hutchings ]
+  * mm: Enable ZSMALLOC as built-in, ZRAM as module (except for
+    armel/{ixp4xx,orion5x}) (Closes: #676779)
+
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 06 Mar 2014 01:04:33 +0000
 
 linux (3.13.5-1) unstable; urgency=medium

debian/config/armel/config-reduced

@@ -31,6 +31,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 ## file: mm/Kconfig
 ##
 # CONFIG_KSM is not set
+# CONFIG_ZSMALLOC is not set
 
 ##
 ## file: net/ipv6/Kconfig

debian/config/config

@@ -281,6 +281,11 @@ CONFIG_BLK_DEV_DRBD=m
 ##
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 
+##
+## file: drivers/block/zram/Kconfig
+##
+CONFIG_ZRAM=m
+
 ##
 ## file: drivers/bluetooth/Kconfig
 ##
@@ -4811,6 +4816,8 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_FRONTSWAP is not set
 # CONFIG_CMA is not set
 CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_ZSMALLOC=y
+# CONFIG_PGTABLE_MAPPING is not set
 
 ##
 ## file: net/Kconfig

debian/config/kernelarch-x86/config

@@ -1498,16 +1498,6 @@ CONFIG_VT6656=m
 ##
 CONFIG_PRISM2_USB=m
 
-##
-## file: drivers/staging/zram/Kconfig
-##
-CONFIG_ZRAM=m
-
-##
-## file: drivers/staging/zsmalloc/Kconfig
-##
-CONFIG_ZSMALLOC=y
-
 ##
 ## file: drivers/thermal/Kconfig
 ##