---

yaml --- r: 188257 b: refs/heads/master c: f3d46b2 h: refs/heads/master i: 188255: d529b45 v: v3
git-mirror · Mar 10, 2010 · a35298b · a35298b
1 parent ed015ac
commit a35298b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19925ce778f9fc371b9607625de3bff04c60121e
+refs/heads/master: f3d46b2e6fa57547f9884330798792afc83f4b04
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -835,6 +835,10 @@ void hw_perf_enable(void)
 			event = cpuc->event_list[i];
 			hwc = &event->hw;
 
+			if (i < n_running &&
+			    match_prev_assignment(hwc, cpuc, i))
+				continue;
+
 			if (hwc->idx == -1)
 				x86_assign_hw_event(event, cpuc, i);