diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-25 10:13:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-25 10:13:17 -0700 |
| commit | 547cc9be86f4c51c51fd429ace6c2e1ef9050d15 (patch) | |
| tree | 723489ee03f7938a062578799b41f395c07416ab /include | |
| parent | 300edd751b102715dda0fe44b4bf8442f6ccf9db (diff) | |
| parent | a6742cb90b567f952a95efa27dee345748d09fc7 (diff) | |
| download | linux-stable-547cc9be86f4c51c51fd429ace6c2e1ef9050d15.tar.gz linux-stable-547cc9be86f4c51c51fd429ace6c2e1ef9050d15.tar.bz2 linux-stable-547cc9be86f4c51c51fd429ace6c2e1ef9050d15.zip | |
Merge tag 'perf_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Borislav Petkov:
- Drop the __weak attribute from a function prototype as it otherwise
leads to the function getting replaced by a dummy stub
- Fix the umask value setup of the frontend event as former is
different on two Intel cores
* tag 'perf_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel: Fix the FRONTEND encoding on GNR and MTL
perf/core: Drop __weak attribute from arch_perf_update_userpage() prototype
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index d5628a7b5eaa..c8dcfdbda1f4 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1845,9 +1845,9 @@ int perf_event_exit_cpu(unsigned int cpu); #define perf_event_exit_cpu NULL #endif -extern void __weak arch_perf_update_userpage(struct perf_event *event, - struct perf_event_mmap_page *userpg, - u64 now); +extern void arch_perf_update_userpage(struct perf_event *event, + struct perf_event_mmap_page *userpg, + u64 now); #ifdef CONFIG_MMU extern __weak u64 arch_perf_get_page_size(struct mm_struct *mm, unsigned long addr); |