From def32073c8d3cf24727cf1a8d65ae3f26f3f0c89 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Thu, 20 Jun 2013 17:50:06 +0200
Subject: [PATCH] --- yaml --- r: 377353 b: refs/heads/master c:
 8b4d801b2b123b6c09742f861fe44a8527b84d47 h: refs/heads/master i:   377351:
 4c2a35429c3ef4deba6762034f4f0a5c113cae61 v: v3

---
 [refs]                              | 2 +-
 trunk/kernel/events/hw_breakpoint.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 09caee648d38..122a80f14843 100644
--- 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
index a64f8aeb5c1f..a853deabe6cf 100644
--- 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);
 	}