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

Commit 0a074815 authored Jun 26, 2019 by qctecmdr Committed by Gerrit - the friendly Code Review server Jun 26, 2019

Merge "defconfig: msm: enable XFRM_INTERFACE, MEMBARRIER for trinket"

parents 7f7615a7 6dfa7982

arch/arm64/configs/vendor/trinket-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ CONFIG_BLK_DEV_INITRD=y
		# CONFIG_RD_LZ4 is not set
		CONFIG_KALLSYMS_ALL=y
		CONFIG_BPF_SYSCALL=y
		# CONFIG_MEMBARRIER is not set
		CONFIG_EMBEDDED=y
		# CONFIG_COMPAT_BRK is not set
		CONFIG_SLAB_FREELIST_RANDOM=y
		@@ -102,6 +101,7 @@ CONFIG_NET=y
		CONFIG_PACKET=y
		CONFIG_UNIX=y
		CONFIG_XFRM_USER=y
		CONFIG_XFRM_INTERFACE=y
		CONFIG_XFRM_STATISTICS=y
		CONFIG_NET_KEY=y
		CONFIG_INET=y

arch/arm64/configs/vendor/trinket_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ CONFIG_BLK_DEV_INITRD=y
		CONFIG_CC_OPTIMIZE_FOR_SIZE=y
		CONFIG_KALLSYMS_ALL=y
		CONFIG_BPF_SYSCALL=y
		# CONFIG_MEMBARRIER is not set
		CONFIG_EMBEDDED=y
		# CONFIG_COMPAT_BRK is not set
		CONFIG_SLAB_FREELIST_RANDOM=y
		@@ -109,6 +108,7 @@ CONFIG_NET=y
		CONFIG_PACKET=y
		CONFIG_UNIX=y
		CONFIG_XFRM_USER=y
		CONFIG_XFRM_INTERFACE=y
		CONFIG_XFRM_STATISTICS=y
		CONFIG_NET_KEY=y
		CONFIG_INET=y