Skip to content

Commit

Permalink
Merge tag 'fpga-fixes-for-5.14' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Greg Kroah-Hartman committed Aug 2, 2021
2 parents 4c4c125 + ec6446d commit 232eee3
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/fpga/dfl-fme-perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 232eee3

Please sign in to comment.