[tip:perf/urgent] perf, x86: Properly account n_added
in [Kernel]
|
Prev: [tip:perf/urgent] perf, x86: Remove superfluous arguments to x86_perf_event_set_period()
Next: Fix Readahead stalling by plugged device queues
From: tip-bot for Peter Zijlstra on 10 Mar 2010 08:20 Commit-ID: 356e1f2e0ace2d4b100c8eda9d49b709e8323da5 Gitweb: http://git.kernel.org/tip/356e1f2e0ace2d4b100c8eda9d49b709e8323da5 Author: Peter Zijlstra <a.p.zijlstra(a)chello.nl> AuthorDate: Sat, 6 Mar 2010 13:49:56 +0100 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Wed, 10 Mar 2010 13:22:32 +0100 perf, x86: Properly account n_added Make sure n_added is properly accounted so that we can rely on the value to reflect the number of added counters. This is needed if its going to be used for more than a boolean check. Signed-off-by: Peter Zijlstra <a.p.zijlstra(a)chello.nl> Cc: Arnaldo Carvalho de Melo <acme(a)infradead.org> Cc: paulus(a)samba.org Cc: eranian(a)google.com Cc: robert.richter(a)amd.com Cc: fweisbec(a)gmail.com LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/kernel/cpu/perf_event.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index b68c4fb..071c840 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -959,7 +959,7 @@ static int x86_pmu_enable(struct perf_event *event) memcpy(cpuc->assign, assign, n*sizeof(int)); cpuc->n_events = n; - cpuc->n_added = n - n0; + cpuc->n_added += n - n0; return 0; } @@ -1302,7 +1302,7 @@ int hw_perf_group_sched_in(struct perf_event *leader, memcpy(cpuc->assign, assign, n0*sizeof(int)); cpuc->n_events = n0; - cpuc->n_added = n1; + cpuc->n_added += n1; ctx->nr_active += n1; /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |