Merge "defconfig: Enable SELinux and its dependencies" (cb841578) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm64/configs/msm8994-perf_defconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ CONFIG_SYSVIPC=y
		CONFIG_NO_HZ=y
		CONFIG_HIGH_RES_TIMERS=y
		CONFIG_IRQ_TIME_ACCOUNTING=y
		CONFIG_AUDIT=y
		CONFIG_RCU_FAST_NO_HZ=y
		CONFIG_IKCONFIG=y
		CONFIG_IKCONFIG_PROC=y
		@@ -91,6 +92,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
		CONFIG_IPV6_SUBTREES=y
		CONFIG_NETFILTER=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_SECMARK=y
		CONFIG_NF_CONNTRACK_EVENTS=y
		CONFIG_NF_CT_PROTO_DCCP=y
		CONFIG_NF_CT_PROTO_SCTP=y
		@@ -108,12 +110,14 @@ CONFIG_NF_CT_NETLINK=y
		CONFIG_NETFILTER_TPROXY=y
		CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
		CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
		CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
		CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
		CONFIG_NETFILTER_XT_TARGET_HARDIDLETIMER=y
		CONFIG_NETFILTER_XT_TARGET_LOG=y
		CONFIG_NETFILTER_XT_TARGET_MARK=y
		CONFIG_NETFILTER_XT_TARGET_NFLOG=y
		CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
		CONFIG_NETFILTER_XT_TARGET_SECMARK=y
		CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
		CONFIG_NETFILTER_XT_TARGET_TPROXY=y
		CONFIG_NETFILTER_XT_TARGET_TRACE=y
		@@ -502,6 +506,7 @@ CONFIG_EXT2_FS_XATTR=y
		CONFIG_EXT3_FS=y
		# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
		CONFIG_EXT4_FS=y
		CONFIG_EXT4_FS_SECURITY=y
		CONFIG_FUSE_FS=y
		CONFIG_VFAT_FS=y
		CONFIG_TMPFS=y
		@@ -524,6 +529,8 @@ CONFIG_KEYS=y
		CONFIG_SECURITY=y
		CONFIG_SECURITY_PFT=y
		CONFIG_SECURITY_NETWORK=y
		CONFIG_LSM_MMAP_MIN_ADDR=4096
		CONFIG_SECURITY_SELINUX=y
		CONFIG_CRYPTO_NULL=y
		CONFIG_CRYPTO_XCBC=y
		CONFIG_CRYPTO_CTR=y

+6 −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_IRQ_TIME_ACCOUNTING=y
		CONFIG_AUDIT=y
		CONFIG_RCU_FAST_NO_HZ=y
		CONFIG_IKCONFIG=y
		CONFIG_IKCONFIG_PROC=y
		@@ -98,6 +99,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
		CONFIG_IPV6_SUBTREES=y
		CONFIG_NETFILTER=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_SECMARK=y
		CONFIG_NF_CONNTRACK_EVENTS=y
		CONFIG_NF_CT_PROTO_DCCP=y
		CONFIG_NF_CT_PROTO_SCTP=y
		@@ -115,12 +117,14 @@ CONFIG_NF_CT_NETLINK=y
		CONFIG_NETFILTER_TPROXY=y
		CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
		CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
		CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
		CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
		CONFIG_NETFILTER_XT_TARGET_HARDIDLETIMER=y
		CONFIG_NETFILTER_XT_TARGET_LOG=y
		CONFIG_NETFILTER_XT_TARGET_MARK=y
		CONFIG_NETFILTER_XT_TARGET_NFLOG=y
		CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
		CONFIG_NETFILTER_XT_TARGET_SECMARK=y
		CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
		CONFIG_NETFILTER_XT_TARGET_TPROXY=y
		CONFIG_NETFILTER_XT_TARGET_TRACE=y
		@@ -599,6 +603,8 @@ CONFIG_SECURITY=y
		CONFIG_SECURITY_PFT=y
		CONFIG_SECURITY_NETWORK=y
		CONFIG_CRYPTO=y
		CONFIG_LSM_MMAP_MIN_ADDR=4096
		CONFIG_SECURITY_SELINUX=y
		CONFIG_CRYPTO_NULL=y
		CONFIG_CRYPTO_XCBC=y
		CONFIG_CRYPTO_CTR=y