diff options
author | Andy Lutomirski <luto@amacapital.net> | 2014-10-24 18:58:11 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 06:10:46 -0500 |
commit | c1317ec2b906442930318d9d6e51425c5a69e9cb (patch) | |
tree | a33788f3feac07ec702dc88a21941911e08bda50 /kernel | |
parent | 1e0fb9ec679c9273a641f1d6f3d25ea47baef2bb (diff) |
perf: Pass the event to arch_perf_update_userpage()
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Vince Weaver <vince@deater.net>
Cc: "hillf.zj" <hillf.zj@alibaba-inc.com>
Cc: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/0fea9a7fac3c1eea86cb0a5954184e74f4213666.1414190806.git.luto@amacapital.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/events/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index cc1487145d33..13209a90b751 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
@@ -4101,7 +4101,8 @@ unlock: | |||
4101 | rcu_read_unlock(); | 4101 | rcu_read_unlock(); |
4102 | } | 4102 | } |
4103 | 4103 | ||
4104 | void __weak arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now) | 4104 | void __weak arch_perf_update_userpage( |
4105 | struct perf_event *event, struct perf_event_mmap_page *userpg, u64 now) | ||
4105 | { | 4106 | { |
4106 | } | 4107 | } |
4107 | 4108 | ||
@@ -4151,7 +4152,7 @@ void perf_event_update_userpage(struct perf_event *event) | |||
4151 | userpg->time_running = running + | 4152 | userpg->time_running = running + |
4152 | atomic64_read(&event->child_total_time_running); | 4153 | atomic64_read(&event->child_total_time_running); |
4153 | 4154 | ||
4154 | arch_perf_update_userpage(userpg, now); | 4155 | arch_perf_update_userpage(event, userpg, now); |
4155 | 4156 | ||
4156 | barrier(); | 4157 | barrier(); |
4157 | ++userpg->lock; | 4158 | ++userpg->lock; |