diff options
author | Dan Williams <dan.j.williams@intel.com> | 2023-06-26 03:53:18 +0300 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2023-06-26 03:53:18 +0300 |
commit | d2f9fe695313b1e50028c1ec4cd09bea67152a60 (patch) | |
tree | 4677c0f61ea1192a782ea3c31e4df88b4d12d04d /include | |
parent | e2c18eb50c7bb191d1ebfed973c2ec3e0066ad37 (diff) | |
parent | c2b34d442226b69e519eb0ba61939a74d91712d4 (diff) | |
download | linux-d2f9fe695313b1e50028c1ec4cd09bea67152a60.tar.xz |
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 'include')
-rw-r--r-- | include/linux/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index d5628a7b5eaa..b99db1eda72c 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -303,6 +303,7 @@ struct pmu { struct module *module; struct device *dev; + struct device *parent; const struct attribute_group **attr_groups; const struct attribute_group **attr_update; const char *name; |