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

Commit 85dd9c67 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: enable XFRM_INTERFACE and MEMBARRIER"

parents fcbe3a6b 849f3f56

arch/arm64/configs/vendor/atoll-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,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_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set
@@ -96,6 +95,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/atoll_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,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
@@ -101,6 +100,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/sdmsteppe-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,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_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set
@@ -97,6 +96,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/sdmsteppe_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,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
@@ -103,6 +102,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/sm8150-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_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set
@@ -104,6 +103,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