From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161134AbbBDOni (ORCPT ); Wed, 4 Feb 2015 09:43:38 -0500 Received: from terminus.zytor.com ([198.137.202.10]:39072 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161095AbbBDOne (ORCPT ); Wed, 4 Feb 2015 09:43:34 -0500 Date: Wed, 4 Feb 2015 06:42:35 -0800 From: tip-bot for Andy Lutomirski Message-ID: Cc: torvalds@linux-foundation.org, hpa@zytor.com, hillf.zj@alibaba-inc.com, peterz@infradead.org, luto@amacapital.net, linux-kernel@vger.kernel.org, mingo@kernel.org, keescook@chromium.org, tglx@linutronix.de, paulus@samba.org, acme@kernel.org, vince@deater.net, Valdis.Kletnieks@vt.edu, aarcange@redhat.com Reply-To: peterz@infradead.org, linux-kernel@vger.kernel.org, luto@amacapital.net, tglx@linutronix.de, mingo@kernel.org, keescook@chromium.org, acme@kernel.org, paulus@samba.org, vince@deater.net, Valdis.Kletnieks@vt.edu, aarcange@redhat.com, torvalds@linux-foundation.org, hpa@zytor.com, hillf.zj@alibaba-inc.com In-Reply-To: <0fea9a7fac3c1eea86cb0a5954184e74f4213666.1414190806.git.luto@amacapital.net> References: <0fea9a7fac3c1eea86cb0a5954184e74f4213666.1414190806.git.luto@amacapital.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/x86] perf: Pass the event to arch_perf_update_userpage( ) Git-Commit-ID: c1317ec2b906442930318d9d6e51425c5a69e9cb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c1317ec2b906442930318d9d6e51425c5a69e9cb Gitweb: http://git.kernel.org/tip/c1317ec2b906442930318d9d6e51425c5a69e9cb Author: Andy Lutomirski AuthorDate: Fri, 24 Oct 2014 15:58:11 -0700 Committer: Ingo Molnar CommitDate: Wed, 4 Feb 2015 12:10:46 +0100 perf: Pass the event to arch_perf_update_userpage() Signed-off-by: Andy Lutomirski Signed-off-by: Peter Zijlstra (Intel) Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Kees Cook Cc: Andrea Arcangeli Cc: Vince Weaver Cc: "hillf.zj" Cc: Valdis Kletnieks Cc: Linus Torvalds Link: http://lkml.kernel.org/r/0fea9a7fac3c1eea86cb0a5954184e74f4213666.1414190806.git.luto@amacapital.net Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/perf_event.c | 3 ++- kernel/events/core.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 6b5acd5..73e84a3 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 = { .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; diff --git a/kernel/events/core.c b/kernel/events/core.c index cc14871..13209a9 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -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;