aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Shields <keepcalm444@gmail.com>2016-06-13 14:48:08 +1000
committerSimon Shields <keepcalm444@gmail.com>2016-06-13 14:48:08 +1000
commit631bc3fecbe703ac4afcfcf197b03e5e4e911240 (patch)
tree40ca849d3687a4276eb22073c6e46dc6d8b8b376
parent6726c46cea51720ece973296c30b2b57e209a14b (diff)
downloadkernel_samsung_smdk4412-631bc3fecbe703ac4afcfcf197b03e5e4e911240.zip
kernel_samsung_smdk4412-631bc3fecbe703ac4afcfcf197b03e5e4e911240.tar.gz
kernel_samsung_smdk4412-631bc3fecbe703ac4afcfcf197b03e5e4e911240.tar.bz2
i9100: update+regen defconfig for zram changes
* don't enable lz4 yet, but enable zsmalloc in order to continue using zram. Change-Id: I78ca1bb9a75c19750e65d76862a65f44986de6ac
-rw-r--r--arch/arm/configs/cyanogenmod_i9100_defconfig17
1 files changed, 13 insertions, 4 deletions
diff --git a/arch/arm/configs/cyanogenmod_i9100_defconfig b/arch/arm/configs/cyanogenmod_i9100_defconfig
index cfacb41..8edecfd 100644
--- a/arch/arm/configs/cyanogenmod_i9100_defconfig
+++ b/arch/arm/configs/cyanogenmod_i9100_defconfig
@@ -105,6 +105,7 @@ CONFIG_RD_GZIP=y
# CONFIG_RD_LZMA is not set
# CONFIG_RD_XZ is not set
# CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -675,6 +676,8 @@ CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_CLEANCACHE is not set
+CONFIG_ZSMALLOC=y
+# CONFIG_PGTABLE_MAPPING is not set
CONFIG_CMA=y
# CONFIG_CMA_DEVELOPEMENT is not set
CONFIG_CMA_BEST_FIT=y
@@ -731,6 +734,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND_FLEXRATE_MAX_DURATION=100
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
# CONFIG_CPU_FREQ_GOV_ADAPTIVE is not set
CONFIG_CPU_FREQ_GOV_PEGASUSQ=y
+# CONFIG_CPU_FREQ_GOV_PEGASUSQ_BOOST is not set
# CONFIG_CPU_FREQ_GOV_SLP is not set
# CONFIG_CPU_FREQ_DVFS_MONITOR is not set
CONFIG_CPU_IDLE=y
@@ -1218,6 +1222,9 @@ CONFIG_SW_SYNC_USER=y
# CONFIG_MTD is not set
# CONFIG_PARPORT is not set
CONFIG_BLK_DEV=y
+CONFIG_ZRAM=y
+# CONFIG_ZRAM_LZ4_COMPRESS is not set
+# CONFIG_ZRAM_DEBUG is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -1298,10 +1305,13 @@ CONFIG_UMTS_MODEM_XMM6260=y
# CONFIG_UMTS_MODEM_XMM6262 is not set
# CONFIG_CDMA_MODEM_CBP71 is not set
# CONFIG_CDMA_MODEM_CBP72 is not set
+# CONFIG_CDMA_MODEM_CBP82 is not set
# CONFIG_LTE_MODEM_CMC221 is not set
+# CONFIG_UMTS_MODEM_SS222 is not set
# CONFIG_CDMA_MODEM_MDM6600 is not set
# CONFIG_TDSCDMA_MODEM_SPRD8803 is not set
# CONFIG_GSM_MODEM_ESC6270 is not set
+# CONFIG_CDMA_MODEM_QSC6085 is not set
# CONFIG_LINK_DEVICE_MIPI is not set
# CONFIG_LINK_DEVICE_DPRAM is not set
# CONFIG_LINK_DEVICE_PLD is not set
@@ -1309,6 +1319,7 @@ CONFIG_UMTS_MODEM_XMM6260=y
CONFIG_LINK_DEVICE_HSIC=y
# CONFIG_LINK_DEVICE_C2C is not set
# CONFIG_LINK_DEVICE_SPI is not set
+# CONFIG_BOOT_DEVICE_SPI is not set
# CONFIG_WORKQUEUE_FRONT is not set
# CONFIG_IPC_CMC22x_OLD_RFS is not set
# CONFIG_SIPC_VER_5 is not set
@@ -2690,10 +2701,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
# CONFIG_LINE6_USB is not set
# CONFIG_VT6656 is not set
# CONFIG_IIO is not set
-CONFIG_XVMALLOC=y
-CONFIG_ZRAM=y
-CONFIG_ZCACHE=y
-# CONFIG_ZRAM_DEBUG is not set
# CONFIG_FB_SM7XX is not set
# CONFIG_LIRC_STAGING is not set
# CONFIG_EASYCAP is not set
@@ -3179,6 +3186,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y
CONFIG_CRYPTO_DEFLATE=y
# CONFIG_CRYPTO_ZLIB is not set
# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_LZ4 is not set
+# CONFIG_CRYPTO_LZ4HC is not set
#
# Random Number Generation