diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 17:53:18 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 17:53:18 -0700 |
| commit | d2f9fe695313b1e50028c1ec4cd09bea67152a60 (patch) | |
| tree | 4677c0f61ea1192a782ea3c31e4df88b4d12d04d /kernel | |
| parent | e2c18eb50c7bb191d1ebfed973c2ec3e0066ad37 (diff) | |
| parent | c2b34d442226b69e519eb0ba61939a74d91712d4 (diff) | |
| download | linux-stable-d2f9fe695313b1e50028c1ec4cd09bea67152a60.tar.gz linux-stable-d2f9fe695313b1e50028c1ec4cd09bea67152a60.tar.bz2 linux-stable-d2f9fe695313b1e50028c1ec4cd09bea67152a60.zip | |
Merge branch 'for-6.5/cxl-perf' into for-6.5/cxl
Pick up initial support for the CXL 3.0 performance monitoring
definition. Small conflicts with the firmware update work as they both
placed their init code in the same location.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index db016e418931..285cf6ca6e81 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -11379,6 +11379,7 @@ static int pmu_dev_alloc(struct pmu *pmu) dev_set_drvdata(pmu->dev, pmu); pmu->dev->bus = &pmu_bus; + pmu->dev->parent = pmu->parent; pmu->dev->release = pmu_dev_release; ret = dev_set_name(pmu->dev, "%s", pmu->name); |