diff --git a/arch/arm64/configs/m1721_defconfig b/arch/arm64/configs/m1721_defconfig index 5e2972680265..1fdaf20ae9e8 100644 --- a/arch/arm64/configs/m1721_defconfig +++ b/arch/arm64/configs/m1721_defconfig @@ -292,6 +292,9 @@ CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_CRYPTO_LZ4=y CONFIG_LZ4_COMPRESS=y +CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZRAM_DEF_COMP=lz4kd +CONFIG_ZRAM_DEF_COMP_LZ4KD=y CONFIG_CRYPTO_LZ4HC=y CONFIG_LZ4HC_COMPRESS=y CONFIG_CRYPTO_LZ4KD=y diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig index 9eb705a8c342..d9f816efb891 100644 --- a/drivers/block/zram/Kconfig +++ b/drivers/block/zram/Kconfig @@ -1,7 +1,7 @@ config ZRAM tristate "Compressed RAM block device support" depends on BLOCK && SYSFS && ZSMALLOC && CRYPTO - select CRYPTO_LZ4 + depends on CRYPTO_LZO || CRYPTO_ZSTD || CRYPTO_LZ4 || CRYPTO_LZ4HC || CRYPTO_LZ4KD || CRYPTO_842 default n help Creates virtual block devices called /dev/zramX (X = 0, 1, ...). @@ -13,6 +13,51 @@ config ZRAM disks and maybe many more. See Documentation/blockdev/zram.txt for more information. + +choice + prompt "Default zram compressor" + default ZRAM_DEF_COMP_LZORLE + depends on ZRAM + +config ZRAM_DEF_COMP_LZORLE + bool "lzo-rle" + depends on CRYPTO_LZO + +config ZRAM_DEF_COMP_ZSTD + bool "zstd" + depends on CRYPTO_ZSTD + +config ZRAM_DEF_COMP_LZ4 + bool "lz4" + depends on CRYPTO_LZ4 + +config ZRAM_DEF_COMP_LZO + bool "lzo" + depends on CRYPTO_LZO + +config ZRAM_DEF_COMP_LZ4HC + bool "lz4hc" + depends on CRYPTO_LZ4HC + +config ZRAM_DEF_COMP_LZ4KD + bool "lz4kd" + depends on CRYPTO_LZ4KD + +config ZRAM_DEF_COMP_842 + bool "842" + depends on CRYPTO_842 + +endchoice + +config ZRAM_DEF_COMP + string + default "lzo-rle" if ZRAM_DEF_COMP_LZORLE + default "zstd" if ZRAM_DEF_COMP_ZSTD + default "lz4" if ZRAM_DEF_COMP_LZ4 + default "lzo" if ZRAM_DEF_COMP_LZO + default "lz4hc" if ZRAM_DEF_COMP_LZ4HC + default "lz4kd" if ZRAM_DEF_COMP_LZ4KD + default "842" if ZRAM_DEF_COMP_842 config ZRAM_WRITEBACK bool "Write back incompressible or idle page to backing device" @@ -41,4 +86,4 @@ config ZRAM_MEMORY_TRACKING config ZRAM_DEFAULT_COMP_ALGORITHM string "Default ZRAM algorithm" - default "lzo" + default "lz4kd"