diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-02 18:07:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-02 18:07:23 +0200 |
| commit | 232eee380e7604c2c88daec67e7409179b202f06 (patch) | |
| tree | 28ae177639467a4cd5b7ea8e8d8f8b577ac38a13 | |
| parent | virt: acrn: Do hcall_destroy_vm() before resource release (diff) | |
| parent | fpga: dfl: fme: Fix cpu hotplug issue in performance reporting (diff) | |
| download | linux-232eee380e7604c2c88daec67e7409179b202f06.tar.xz linux-232eee380e7604c2c88daec67e7409179b202f06.zip | |
Merge tag 'fpga-fixes-for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga into char-misc-linus
Moritz writes:
FPGA Manager fix for 5.14
Kajol's fix adds a missing pmu_migrate_context() call which presents a
problem if the CPU collecting FME PMU data is taken offline.
All patches have been reviewed on the mailing list, and have been in the
last few linux-next releases (as part of my fixes branch) without issues.
Signed-off-by: Moritz Fischer <mdf@kernel.org>
* tag 'fpga-fixes-for-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
fpga: dfl: fme: Fix cpu hotplug issue in performance reporting
| -rw-r--r-- | drivers/fpga/dfl-fme-perf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/fpga/dfl-fme-perf.c b/drivers/fpga/dfl-fme-perf.c index 4299145ef347..587c82be12f7 100644 --- a/drivers/fpga/dfl-fme-perf.c +++ b/drivers/fpga/dfl-fme-perf.c @@ -953,6 +953,8 @@ static int fme_perf_offline_cpu(unsigned int cpu, struct hlist_node *node) return 0; priv->cpu = target; + perf_pmu_migrate_context(&priv->pmu, cpu, target); + return 0; } |