diff options
author | Will Deacon <will@kernel.org> | 2024-05-09 15:56:10 +0100 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2024-05-09 15:56:10 +0100 |
commit | 42e7ddbaf1909835a81e8e746cf6420bdd63d237 (patch) | |
tree | c9717442318bf745c97d3500dbd0c5b8520b0bec /drivers/perf/amlogic/meson_ddr_pmu_core.c | |
parent | a5a5ce57953b53e5ec5b9b9455176bc90253cfa8 (diff) | |
parent | 410e471f87465f04d7ae7f8ed16ef8e7a3b5517c (diff) |
Merge branch 'for-next/perf' into for-next/core
* for-next/perf: (41 commits)
arm64: Add USER_STACKTRACE support
drivers/perf: hisi: hns3: Actually use devm_add_action_or_reset()
drivers/perf: hisi: hns3: Fix out-of-bound access when valid event group
drivers/perf: hisi_pcie: Fix out-of-bound access when valid event group
perf/arm-spe: Assign parents for event_source device
perf/arm-smmuv3: Assign parents for event_source device
perf/arm-dsu: Assign parents for event_source device
perf/arm-dmc620: Assign parents for event_source device
perf/arm-ccn: Assign parents for event_source device
perf/arm-cci: Assign parents for event_source device
perf/alibaba_uncore: Assign parents for event_source device
perf/arm_pmu: Assign parents for event_source devices
perf/imx_ddr: Assign parents for event_source devices
perf/qcom: Assign parents for event_source devices
Documentation: qcom-pmu: Use /sys/bus/event_source/devices paths
perf/riscv: Assign parents for event_source devices
perf/thunderx2: Assign parents for event_source devices
Documentation: thunderx2-pmu: Use /sys/bus/event_source/devices paths
perf/xgene: Assign parents for event_source devices
Documentation: xgene-pmu: Use /sys/bus/event_source/devices paths
...
Diffstat (limited to 'drivers/perf/amlogic/meson_ddr_pmu_core.c')
-rw-r--r-- | drivers/perf/amlogic/meson_ddr_pmu_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/perf/amlogic/meson_ddr_pmu_core.c b/drivers/perf/amlogic/meson_ddr_pmu_core.c index bbc7285fd934..07446d784a1a 100644 --- a/drivers/perf/amlogic/meson_ddr_pmu_core.c +++ b/drivers/perf/amlogic/meson_ddr_pmu_core.c @@ -492,6 +492,7 @@ int meson_ddr_pmu_create(struct platform_device *pdev) *pmu = (struct ddr_pmu) { .pmu = { .module = THIS_MODULE, + .parent = &pdev->dev, .capabilities = PERF_PMU_CAP_NO_EXCLUDE, .task_ctx_nr = perf_invalid_context, .attr_groups = attr_groups, |