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 /arch/x86/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 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 6b5acd5f4a34..73e84a348de1 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -1915,7 +1915,8 @@ static struct pmu pmu = { | |||
1915 | .flush_branch_stack = x86_pmu_flush_branch_stack, | 1915 | .flush_branch_stack = x86_pmu_flush_branch_stack, |
1916 | }; | 1916 | }; |
1917 | 1917 | ||
1918 | void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now) | 1918 | void arch_perf_update_userpage(struct perf_event *event, |
1919 | struct perf_event_mmap_page *userpg, u64 now) | ||
1919 | { | 1920 | { |
1920 | struct cyc2ns_data *data; | 1921 | struct cyc2ns_data *data; |
1921 | 1922 | ||