lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 4 Feb 2015 06:42:35 -0800 From: tip-bot for Andy Lutomirski <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: torvalds@...ux-foundation.org, hpa@...or.com, hillf.zj@...baba-inc.com, peterz@...radead.org, luto@...capital.net, linux-kernel@...r.kernel.org, mingo@...nel.org, keescook@...omium.org, tglx@...utronix.de, paulus@...ba.org, acme@...nel.org, vince@...ter.net, Valdis.Kletnieks@...edu, aarcange@...hat.com Subject: [tip:perf/x86] perf: Pass the event to arch_perf_update_userpage( ) Commit-ID: c1317ec2b906442930318d9d6e51425c5a69e9cb Gitweb: http://git.kernel.org/tip/c1317ec2b906442930318d9d6e51425c5a69e9cb Author: Andy Lutomirski <luto@...capital.net> AuthorDate: Fri, 24 Oct 2014 15:58:11 -0700 Committer: Ingo Molnar <mingo@...nel.org> CommitDate: Wed, 4 Feb 2015 12:10:46 +0100 perf: Pass the event to arch_perf_update_userpage() Signed-off-by: Andy Lutomirski <luto@...capital.net> Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org> Cc: Paul Mackerras <paulus@...ba.org> Cc: Arnaldo Carvalho de Melo <acme@...nel.org> Cc: Kees Cook <keescook@...omium.org> Cc: Andrea Arcangeli <aarcange@...hat.com> Cc: Vince Weaver <vince@...ter.net> Cc: "hillf.zj" <hillf.zj@...baba-inc.com> Cc: Valdis Kletnieks <Valdis.Kletnieks@...edu> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Link: http://lkml.kernel.org/r/0fea9a7fac3c1eea86cb0a5954184e74f4213666.1414190806.git.luto@amacapital.net Signed-off-by: Ingo Molnar <mingo@...nel.org> --- 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists