diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-27 19:27:02 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-27 19:27:01 -0700 |
| commit | 6a45925f9ab288c5da8b8c50f2ee2a633faa8cad (patch) | |
| tree | 1e4de0a645b5db7d3959dee61e65566e2b677df8 /arch | |
| parent | 71f2f97d611cccabf7704413949d53b301e95ff7 (diff) | |
| parent | bb8aea098db1d5df5828634f80a6ad5046ab50dc (diff) | |
Merge "soc: qcom: build kryo perf events only for MSM8996"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/perf_event.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 8fa6f87cc31d..52d046b6a920 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -674,7 +674,9 @@ static const struct of_device_id armv8_pmu_of_device_ids[] = { {.compatible = "arm,armv8-pmuv3", .data = armv8_pmuv3_init}, {.compatible = "arm,cortex-a53-pmu", .data = armv8_a53_pmu_init}, {.compatible = "arm,cortex-a57-pmu", .data = armv8_a57_pmu_init}, +#ifdef CONFIG_ARCH_MSM8996 {.compatible = "qcom,kryo-pmuv3", .data = kryo_pmu_init}, +#endif {}, }; |