Skip to contentSkip to conversation

kernel/events: Add a missing prototype for arch_perf_update_userpage()

PATCH Applied Benjamin Thiel 3 participants 3 messages Jan 9, 2020 – Jan 29, 2020 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel/events: Add a missing prototype for arch_perf_update_userpage()

... in order to fix a -Wmissing-prototype warning.

No functional changes.

---
 include/linux/perf_event.h | 3 +++
 1 file changed, 3 insertions(+)
include/linux/perf_event.h +3 -0
index 6d4c22aee384..de3874271814 100644
@@ -1544,4 +1544,7 @@ int perf_event_exit_cpu(unsigned int cpu);
 #define perf_event_exit_cpu	NULL
 #endif
 
+void __weak arch_perf_update_userpage(
+	struct perf_event *event, struct perf_event_mmap_page *userpg, u64 now);
+
 #endif /* _LINUX_PERF_EVENT_H */
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 14 lines · Benjamin Thiel

... in order to fix a -Wmissing-prototype warning.

No functional changes.

---
 include/linux/perf_event.h | 3 +++
 1 file changed, 3 insertions(+)
include/linux/perf_event.h +0 -0
index 6d4c22aee384..de3874271814 100644

include/linux/perf_event.h int perf_event_exit_cpu(unsigned int cpu); · line 1549

Quoted 6 lines
include/linux/perf_event.h +3 -0
@@ -1544,4 +1544,7 @@ int perf_event_exit_cpu(unsigned int cpu);
 #define perf_event_exit_cpu	NULL
 #endif
 
+void __weak arch_perf_update_userpage(
+	struct perf_event *event, struct perf_event_mmap_page *userpg, u64 now);
+

Indeed so, I've slightly changed to:

+extern void __weak arch_perf_update_userpage(struct perf_event *event,
+ struct perf_event_mmap_page *userpg,
+ u64 now);

Thanks!

merge bot Applied
#2 lore raw
In reply to Benjamin Thiel
The following commit has been merged into the perf/urgent branch of tip:

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     f1ec3a517b4352e78dbef6b1e591f43202ecb3fe
Gitweb:        https://git.kernel.org/tip/f1ec3a517b4352e78dbef6b1e591f43202ecb3fe
Author:        Benjamin Thiel <[email protected]>
AuthorDate:    Thu, 09 Jan 2020 14:13:51 +01:00
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Tue, 28 Jan 2020 21:26:44 +01:00

kernel/events: Add a missing prototype for arch_perf_update_userpage()

... in order to fix a -Wmissing-prototype warning.

No functional changes.

---
 include/linux/perf_event.h | 4 ++++
 1 file changed, 4 insertions(+)
include/linux/perf_event.h +4 -0
index 6d4c22a..52928e0 100644
@@ -1544,4 +1544,8 @@ 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);
+
 #endif /* _LINUX_PERF_EVENT_H */