From 8afda14941a26401115c400030f27cfb236d8cca Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Fri, 18 Jan 2013 13:42:59 +0000 Subject: [PATCH] --- yaml --- r: 351165 b: refs/heads/master c: 8f3b90b585d3e879b03ce2a202da04d59dd5b699 h: refs/heads/master i: 351163: 914497a596815a21449f311820810e1cced3fd5d v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/perf_event.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ee728d403199..fbe4f53af4da 100644 --- 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 index f9e8657dd241..6df1969811c8 100644 --- 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);