Merge "defconfig: msm: Sync Bengal with Android-4.19 configs" (4d86e041) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm64/configs/vendor/bengal-perf_defconfig

+6 −3

Original line number	Diff line number	Diff line
		@@ -17,18 +17,17 @@ CONFIG_RCU_FAST_NO_HZ=y
		CONFIG_RCU_NOCB_CPU=y
		CONFIG_IKCONFIG=y
		CONFIG_IKCONFIG_PROC=y
		CONFIG_IKHEADERS=y
		CONFIG_LOG_CPU_MAX_BUF_SHIFT=17
		CONFIG_MEMCG=y
		CONFIG_MEMCG_SWAP=y
		CONFIG_BLK_CGROUP=y
		CONFIG_RT_GROUP_SCHED=y
		CONFIG_CGROUP_FREEZER=y
		CONFIG_CPUSETS=y
		CONFIG_CGROUP_CPUACCT=y
		CONFIG_CGROUP_BPF=y
		CONFIG_SCHED_CORE_CTL=y
		CONFIG_NAMESPACES=y
		# CONFIG_UTS_NS is not set
		# CONFIG_PID_NS is not set
		CONFIG_SCHED_AUTOGROUP=y
		CONFIG_SCHED_TUNE=y
		@@ -41,6 +40,7 @@ CONFIG_BLK_DEV_INITRD=y
		# CONFIG_FHANDLE is not set
		CONFIG_KALLSYMS_ALL=y
		CONFIG_BPF_SYSCALL=y
		CONFIG_BPF_JIT_ALWAYS_ON=y
		CONFIG_EMBEDDED=y
		# CONFIG_COMPAT_BRK is not set
		CONFIG_SLAB_FREELIST_RANDOM=y
		@@ -92,7 +92,6 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
		CONFIG_PANIC_ON_REFCOUNT_ERROR=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		CONFIG_MODULE_FORCE_UNLOAD=y
		CONFIG_MODVERSIONS=y
		CONFIG_MODULE_SIG=y
		CONFIG_MODULE_SIG_FORCE=y
		@@ -260,6 +259,7 @@ CONFIG_NET_ACT_SKBEDIT=y
		CONFIG_DNS_RESOLVER=y
		CONFIG_QRTR=y
		CONFIG_QRTR_SMD=y
		CONFIG_BPF_JIT=y
		CONFIG_SOCKEV_NLMCAST=y
		CONFIG_BT=y
		CONFIG_MSM_BT_POWER=y
		@@ -270,6 +270,7 @@ CONFIG_RFKILL=y
		CONFIG_NFC_NQ=y
		CONFIG_FW_LOADER_USER_HELPER=y
		CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		# CONFIG_FW_CACHE is not set
		CONFIG_REGMAP_WCD_IRQ=y
		CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
		CONFIG_DMA_CMA=y
		@@ -596,6 +597,7 @@ CONFIG_QCOM_L2_COUNTERS=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
		@@ -652,6 +654,7 @@ CONFIG_MAGIC_SYSRQ=y
		CONFIG_PANIC_TIMEOUT=5
		CONFIG_SCHEDSTATS=y
		# CONFIG_DEBUG_PREEMPT is not set
		CONFIG_DEBUG_LIST=y
		CONFIG_IPC_LOGGING=y
		CONFIG_CORESIGHT=y
		CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y

arch/arm64/configs/vendor/bengal_defconfig

+5 −3

Original line number	Diff line number	Diff line
		@@ -16,12 +16,12 @@ CONFIG_RCU_FAST_NO_HZ=y
		CONFIG_RCU_NOCB_CPU=y
		CONFIG_IKCONFIG=y
		CONFIG_IKCONFIG_PROC=y
		CONFIG_IKHEADERS=y
		CONFIG_LOG_CPU_MAX_BUF_SHIFT=17
		CONFIG_MEMCG=y
		CONFIG_MEMCG_SWAP=y
		CONFIG_BLK_CGROUP=y
		CONFIG_DEBUG_BLK_CGROUP=y
		CONFIG_RT_GROUP_SCHED=y
		CONFIG_CGROUP_FREEZER=y
		CONFIG_CPUSETS=y
		CONFIG_CGROUP_CPUACCT=y
		@@ -29,7 +29,6 @@ CONFIG_CGROUP_BPF=y
		CONFIG_CGROUP_DEBUG=y
		CONFIG_SCHED_CORE_CTL=y
		CONFIG_NAMESPACES=y
		# CONFIG_UTS_NS is not set
		# CONFIG_PID_NS is not set
		CONFIG_SCHED_AUTOGROUP=y
		CONFIG_SCHED_TUNE=y
		@@ -42,6 +41,7 @@ CONFIG_BLK_DEV_INITRD=y
		# CONFIG_FHANDLE is not set
		CONFIG_KALLSYMS_ALL=y
		CONFIG_BPF_SYSCALL=y
		CONFIG_BPF_JIT_ALWAYS_ON=y
		CONFIG_EMBEDDED=y
		# CONFIG_COMPAT_BRK is not set
		CONFIG_SLAB_FREELIST_RANDOM=y
		@@ -97,7 +97,6 @@ CONFIG_KPROBES=y
		CONFIG_PANIC_ON_REFCOUNT_ERROR=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		CONFIG_MODULE_FORCE_UNLOAD=y
		CONFIG_MODVERSIONS=y
		CONFIG_MODULE_SIG=y
		CONFIG_MODULE_SIG_FORCE=y
		@@ -269,6 +268,7 @@ CONFIG_NET_ACT_SKBEDIT=y
		CONFIG_DNS_RESOLVER=y
		CONFIG_QRTR=y
		CONFIG_QRTR_SMD=y
		CONFIG_BPF_JIT=y
		CONFIG_SOCKEV_NLMCAST=y
		CONFIG_BT=y
		CONFIG_MSM_BT_POWER=y
		@@ -279,6 +279,7 @@ CONFIG_RFKILL=y
		CONFIG_NFC_NQ=y
		CONFIG_FW_LOADER_USER_HELPER=y
		CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		# CONFIG_FW_CACHE is not set
		CONFIG_REGMAP_WCD_IRQ=y
		CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
		CONFIG_DMA_CMA=y
		@@ -621,6 +622,7 @@ CONFIG_QCOM_L2_COUNTERS=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