---

yaml --- r: 377353 b: refs/heads/master c: 8b4d801 h: refs/heads/master i: 377351: 4c2a354 v: v3
git-mirror · Jun 20, 2013 · def3207 · def3207
1 parent 9790c15
commit def3207
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 003002e04ed38618fc37b92ba128f5ca79d39f4f
+refs/heads/master: 8b4d801b2b123b6c09742f861fe44a8527b84d47
diff --git a/trunk/kernel/events/hw_breakpoint.c b/trunk/kernel/events/hw_breakpoint.c
@@ -120,7 +120,7 @@ static int task_bp_pinned(int cpu, struct perf_event *bp, enum bp_type_idx type)
 	list_for_each_entry(iter, &bp_task_head, hw.bp_list) {
 		if (iter->hw.bp_target == tsk &&
 		    find_slot_idx(iter) == type &&
-		    cpu == iter->cpu)
+		    (iter->cpu < 0 || cpu == iter->cpu))
 			count += hw_breakpoint_weight(iter);
 	}