From d529b45c463199ee6b954bb6401af6d6b6cc620a Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Sat, 6 Mar 2010 13:49:56 +0100 Subject: [PATCH] --- yaml --- r: 188255 b: refs/heads/master c: 356e1f2e0ace2d4b100c8eda9d49b709e8323da5 h: refs/heads/master i: 188253: ab53db1bbd5770096078213f4656c705e9b06d80 188251: ae4908cc8d3159b37d6e8e6820ec42b20506044f 188247: 3e8b24edef331e265f2ab55c1a2b53f36055a17d 188239: 613abeabe4d112ddb3dfb188ef30ddab63053eda 188223: 6012b0172273333d237b0f2e5479337ed72f36d3 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0519de6af76e..6e975fcf6adf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71e2d2828046133ed985696a02e2e1499ca0bfb8 +refs/heads/master: 356e1f2e0ace2d4b100c8eda9d49b709e8323da5 diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c index b68c4fb7a944..071c8405debd 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event.c +++ b/trunk/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; /*