---

yaml --- r: 188255 b: refs/heads/master c: 356e1f2 h: refs/heads/master i: 188253: ab53db1 188251: ae4908c 188247: 3e8b24e 188239: 613abea 188223: 6012b01 v: v3
git-mirror · Mar 10, 2010 · d529b45 · d529b45
1 parent 4754240
commit d529b45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 
 	/*