perf: Pass the event to arch_perf_update_userpage() (c1317ec2) · Commits · 戴 / test

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:

arch/x86/kernel/cpu/perf_event.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1915,7 +1915,8 @@ static struct pmu pmu = {
		.flush_branch_stack = x86_pmu_flush_branch_stack,
		};

		void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)
		void arch_perf_update_userpage(struct perf_event *event,
		struct perf_event_mmap_page *userpg, u64 now)
		{
		struct cyc2ns_data *data;

+3 −2

Original line number	Diff line number	Diff line
		@@ -4101,7 +4101,8 @@ unlock:
		rcu_read_unlock();
		}

		void __weak arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)
		void __weak arch_perf_update_userpage(
		struct perf_event event, struct perf_event_mmap_page userpg, u64 now)
		{
		}

		@@ -4151,7 +4152,7 @@ void perf_event_update_userpage(struct perf_event *event)
		userpg->time_running = running +
		atomic64_read(&event->child_total_time_running);

		arch_perf_update_userpage(userpg, now);
		arch_perf_update_userpage(event, userpg, now);

		barrier();
		++userpg->lock;