diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2015-09-24 02:46:27 +0100 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2015-09-24 02:46:27 +0100 |
commit | a94e67cc3fe355dc29e88042ea41fa2002739b74 (patch) | |
tree | 19ccb6e173e06e8e850158d3f3b98d97f59d73b3 | |
parent | f0fc9d4c049a85c250fb331272b4daf13629a125 (diff) | |
download | kernel_replicant_linux-a94e67cc3fe355dc29e88042ea41fa2002739b74.tar.gz kernel_replicant_linux-a94e67cc3fe355dc29e88042ea41fa2002739b74.tar.bz2 kernel_replicant_linux-a94e67cc3fe355dc29e88042ea41fa2002739b74.zip |
mm: Change ZBUD back to built-in
It's not really useful as a module. Currently we get the following
error messages on boot:
zpool: no driver for type zbud
zswap: zbud zpool not available
zswap: zpool creation failed
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/config/config | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 3b1ff64f5ad5..3d0170208208 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ linux (4.2.1-1) UNRELEASED; urgency=medium * mmc: Drop "eMMC: Don't initialize partitions on RPMB flagged areas", as upstream commit 4e93b9a6abc0 ("mmc: card: Don't access RPMB partitions for normal read/write") looks like a cleaner solution + * mm: Change ZBUD back to built-in, as it's not really useful as a module [ Aurelien Jarno ] * [mips*el] Fix BPF assembly code for pre-R2 CPUs. (fixes FTBFS) diff --git a/debian/config/config b/debian/config/config index f36a4ab66108..063e30279ad0 100644 --- a/debian/config/config +++ b/debian/config/config @@ -5489,7 +5489,7 @@ CONFIG_FRONTSWAP=y # CONFIG_CMA is not set CONFIG_MEM_SOFT_DIRTY=y CONFIG_ZSWAP=y -CONFIG_ZBUD=m +CONFIG_ZBUD=y CONFIG_ZSMALLOC=m # CONFIG_PGTABLE_MAPPING is not set |