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

Commit f50e22af authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable SELinux and its dependencies"

parents 8b9057d0 eeeeec40

arch/arm/configs/msm8916-perf_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_AUDIT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -475,6 +476,10 @@ CONFIG_DEBUG_USER=y 
# CONFIG_ARM_UNWIND is not set

CONFIG_DEBUG_SET_MODULE_RONX=y

CONFIG_KEYS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y

arch/arm/configs/msm8916_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_AUDIT=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -508,6 +509,10 @@ CONFIG_DEBUG_LL=y 
CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_SET_MODULE_RONX=y

CONFIG_KEYS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y