Pull perf fixes from Thomas Gleixner: "A set of fixes and improvements for the perf subsystem: Kernel fixes: - Install cgroup events to the correct CPU context to prevent a potential list double add - Prevent an integer underflow in the perf mlock accounting - Add a missing prototype for arch_perf_update_userpage() Tooling: - Add a missing unlock in the error path of maps__insert() in perf maps. - Fix the build with the latest libbfd - Fix the perf parser so it does not delete parse event terms, which caused a regression for using perf with the ARM CoreSight as the sink configuration was missing due to the deletion. - Fix the double free in the perf CPU map merging test case - Add the missing ustring support for the perf probe command" * tag 'perf-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf maps: Add missing unlock to maps__insert() error case perf probe: Add ustring support for perf probe command perf: Make perf able to build with latest libbfd perf test: Fix test case Merge cpu map perf parse: Copy string to perf_evsel_config_term perf parse: Refactor 'struct perf_evsel_config_term' kernel/events: Add a missing prototype for arch_perf_update_userpage() perf/cgroups: Install cgroup events to correct cpuctx perf/core: Fix mlock accounting in perf_mmap()
Showing the changes to include/linux (1 of 10 files). Show all
Unified · Split
| @@ -1544,4 +1544,8 @@ int perf_event_exit_cpu(unsigned int cpu); · 1543 unmodified lines | ||
| 1544 | 1544 | #define perf_event_exit_cpu NULL |
| 1545 | 1545 | #endif |
| 1546 | 1546 | |
| 1547 | +extern void __weak arch_perf_update_userpage(struct perf_event *event, | |
| 1548 | + struct perf_event_mmap_page *userpg, | |
| 1549 | + u64 now); | |
| 1550 | + | |
| 1547 | 1551 | #endif /* _LINUX_PERF_EVENT_H */ |