Skip to content

Commit 870cb65

Browse files
Ziyannandi34
authored andcommitted
tuna: defconfig: enable LZ4-backed zRAM
Change-Id: Ida98ff1bce9d2b1c17e10734e872dff67c635dca
1 parent f87ce9d commit 870cb65

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

arch/arm/configs/tuna_defconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
CONFIG_EXPERIMENTAL=y
2-
# CONFIG_SWAP is not set
32
CONFIG_AUDIT=y
43
CONFIG_CGROUPS=y
54
CONFIG_CGROUP_DEBUG=y
65
CONFIG_CGROUP_FREEZER=y
76
CONFIG_CGROUP_CPUACCT=y
87
CONFIG_RESOURCE_COUNTERS=y
8+
CONFIG_CGROUP_MEM_RES_CTLR=y
9+
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
910
CONFIG_CGROUP_SCHED=y
1011
CONFIG_RT_GROUP_SCHED=y
1112
CONFIG_BLK_DEV_INITRD=y
@@ -53,6 +54,7 @@ CONFIG_PREEMPT=y
5354
CONFIG_HIGHMEM=y
5455
CONFIG_COMPACTION=y
5556
CONFIG_KSM=y
57+
CONFIG_ZSMALLOC=y
5658
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
5759
CONFIG_CMDLINE="console=ttyFIQ0 androidboot.console=ttyFIQ0 mem=1G vmalloc=768M omap_wdt.timer_margin=30 no_console_suspend"
5860
CONFIG_CMDLINE_EXTEND=y
@@ -223,6 +225,8 @@ CONFIG_MTD_BLOCK=y
223225
CONFIG_MTD_M25P80=y
224226
CONFIG_MTD_NAND_IDS=y
225227
CONFIG_MTD_ONENAND=y
228+
CONFIG_ZRAM=y
229+
CONFIG_ZRAM_LZ4_COMPRESS=y
226230
CONFIG_BLK_DEV_LOOP=y
227231
CONFIG_BLK_DEV_RAM=y
228232
CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -480,5 +484,7 @@ CONFIG_SMC_KERNEL_CRYPTO=y
480484
CONFIG_CRYPTO_SHA256=y
481485
CONFIG_CRYPTO_AES_ARM=y
482486
CONFIG_CRYPTO_TWOFISH=y
487+
CONFIG_CRYPTO_LZO=y
488+
CONFIG_CRYPTO_LZ4=y
483489
CONFIG_CRYPTO_ANSI_CPRNG=y
484490
CONFIG_CRC_CCITT=y

arch/arm/configs/tuna_kitkat_defconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
CONFIG_EXPERIMENTAL=y
2-
# CONFIG_SWAP is not set
32
CONFIG_AUDIT=y
43
CONFIG_CGROUPS=y
54
CONFIG_CGROUP_DEBUG=y
65
CONFIG_CGROUP_FREEZER=y
76
CONFIG_CGROUP_CPUACCT=y
87
CONFIG_RESOURCE_COUNTERS=y
8+
CONFIG_CGROUP_MEM_RES_CTLR=y
9+
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
910
CONFIG_CGROUP_SCHED=y
1011
CONFIG_RT_GROUP_SCHED=y
1112
CONFIG_BLK_DEV_INITRD=y
@@ -53,6 +54,7 @@ CONFIG_PREEMPT=y
5354
CONFIG_HIGHMEM=y
5455
CONFIG_COMPACTION=y
5556
CONFIG_KSM=y
57+
CONFIG_ZSMALLOC=y
5658
CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
5759
CONFIG_CMDLINE="console=ttyFIQ0 androidboot.console=ttyFIQ0 mem=1G vmalloc=768M omap_wdt.timer_margin=30 no_console_suspend"
5860
CONFIG_CMDLINE_EXTEND=y
@@ -221,6 +223,8 @@ CONFIG_MTD_BLOCK=y
221223
CONFIG_MTD_M25P80=y
222224
CONFIG_MTD_NAND_IDS=y
223225
CONFIG_MTD_ONENAND=y
226+
CONFIG_ZRAM=y
227+
CONFIG_ZRAM_LZ4_COMPRESS=y
224228
CONFIG_BLK_DEV_LOOP=y
225229
CONFIG_BLK_DEV_RAM=y
226230
CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -476,5 +480,7 @@ CONFIG_SMC_KERNEL_CRYPTO=y
476480
CONFIG_CRYPTO_SHA256=y
477481
CONFIG_CRYPTO_AES_ARM=y
478482
CONFIG_CRYPTO_TWOFISH=y
483+
CONFIG_CRYPTO_LZO=y
484+
CONFIG_CRYPTO_LZ4=y
479485
CONFIG_CRYPTO_ANSI_CPRNG=y
480486
CONFIG_CRC_CCITT=y

0 commit comments

Comments
 (0)