Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1af42a8 authored Jul 20, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jul 20, 2015

Merge "defconfig: msm: Enable ZRAM support for msm8996 64-bit"

parents 3a2f8792 2839e60c

arch/arm64/configs/msm-perf_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ CONFIG_SMP=y
		CONFIG_SCHED_MC=y
		CONFIG_PREEMPT=y
		CONFIG_CMA=y
		CONFIG_ZSMALLOC=y
		CONFIG_BALANCE_ANON_FILE_RECLAIM=y
		CONFIG_ARMV8_DEPRECATED=y
		CONFIG_SWP_EMULATION=y
		# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
		@@ -198,6 +200,7 @@ CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=8
		CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_QSEECOM=y

arch/arm64/configs/msm_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ CONFIG_SMP=y
		CONFIG_SCHED_MC=y
		CONFIG_PREEMPT=y
		CONFIG_CMA=y
		CONFIG_ZSMALLOC=y
		CONFIG_BALANCE_ANON_FILE_RECLAIM=y
		CONFIG_ARMV8_DEPRECATED=y
		CONFIG_SWP_EMULATION=y
		# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
		@@ -197,6 +199,7 @@ CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=8
		CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_QSEECOM=y