---

yaml --- r: 351165 b: refs/heads/master c: 8f3b90b h: refs/heads/master i: 351163: 914497a v: v3
git-mirror · Jan 18, 2013 · 8afda14 · 8afda14
1 parent d4e8a34
commit 8afda14
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76b8a0e4c8bda5f03574b8a904331266d162c796
+refs/heads/master: 8f3b90b585d3e879b03ce2a202da04d59dd5b699
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
@@ -149,12 +149,6 @@ u64 armpmu_event_update(struct perf_event *event)
 static void
 armpmu_read(struct perf_event *event)
 {
-	struct hw_perf_event *hwc = &event->hw;
-
-	/* Don't read disabled counters! */
-	if (hwc->idx < 0)
-		return;
-
 	armpmu_event_update(event);
 }
 
@@ -207,8 +201,6 @@ armpmu_del(struct perf_event *event, int flags)
 	struct hw_perf_event *hwc = &event->hw;
 	int idx = hwc->idx;
 
-	WARN_ON(idx < 0);
-
 	armpmu_stop(event, PERF_EF_UPDATE);
 	hw_events->events[idx] = NULL;
 	clear_bit(idx, hw_events->used_mask);