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

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

Merge "defconfig: msm: Enable Hardware perf event for 8937/8953 32 bit"

parents be3cd936 543a87bd

arch/arm/configs/msm8937-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ CONFIG_ARM_PSCI=y 
CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

# CONFIG_HW_PERF_EVENTS is not set

CONFIG_CMA=y

CONFIG_CMA_DEBUGFS=y

CONFIG_ZSMALLOC=y

arch/arm/configs/msm8937_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ CONFIG_ARM_PSCI=y 
CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

# CONFIG_HW_PERF_EVENTS is not set

CONFIG_CMA=y

CONFIG_CMA_DEBUGFS=y

CONFIG_ZSMALLOC=y

arch/arm/configs/msmcortex-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ CONFIG_ARM_PSCI=y 
CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

# CONFIG_HW_PERF_EVENTS is not set

CONFIG_CMA=y

CONFIG_CMA_DEBUGFS=y

CONFIG_ZSMALLOC=y

arch/arm/configs/msmcortex_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ CONFIG_ARM_PSCI=y 
CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

# CONFIG_HW_PERF_EVENTS is not set

CONFIG_CMA=y

CONFIG_CMA_DEBUGFS=y

CONFIG_ZSMALLOC=y

arch/arm64/kernel/perf_event.c

+2 −0
Original line number Diff line number Diff line
@@ -1614,7 +1614,9 @@ static struct notifier_block perf_cpu_idle_nb = { 
 */

static const struct of_device_id armpmu_of_device_ids[] = {

	{.compatible = "arm,armv8-pmuv3"},

#ifdef CONFIG_ARCH_MSM8996

	{.compatible = "qcom,kryo-pmuv3", .data = kryo_pmu_init},

#endif

	{},

};