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

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

Merge "defconfig: msm: Sync Kona with Android-4.19 configs"

parents c59444ae 7991612c

arch/arm64/configs/vendor/kona-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

# CONFIG_NVMEM_SYSFS is not set

CONFIG_QCOM_QFPROM=y

CONFIG_NVMEM_SPMI_SDAM=y
@@ -685,6 +686,7 @@ CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y 
CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_STATIC_USERMODEHELPER=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_APPARMOR=y

arch/arm64/configs/vendor/kona_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ CONFIG_QCOM_LLCC_PMU=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

# CONFIG_NVMEM_SYSFS is not set

CONFIG_QCOM_QFPROM=y

CONFIG_NVMEM_SPMI_SDAM=y
@@ -721,6 +722,7 @@ CONFIG_SECURITY=y 
CONFIG_HARDENED_USERCOPY=y

CONFIG_HARDENED_USERCOPY_PAGESPAN=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_STATIC_USERMODEHELPER=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_APPARMOR=y

drivers/android/binderfs.c

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ static int binderfs_fill_super(struct super_block *sb, void *data, int silent) 
	int ret;

	struct binderfs_info *info;

	struct inode *inode = NULL;

	struct binderfs_device device_info = { 0 };

	struct binderfs_device device_info = { { 0 } };

	const char *name;

	size_t len;