From a98c9460187491c7402ae2e414ec0c74f8404252 Mon Sep 17 00:00:00 2001 From: James Hogan Date: Wed, 27 Feb 2013 21:54:51 +0000 Subject: [PATCH] --- yaml --- r: 367224 b: refs/heads/master c: 1fb4dc5c39af941d3abc597337e0ea776bfce0f2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/metag/kernel/perf/perf_event.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 55ff47f3bc01..0d08490371d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9344de1b1c64b2217f3b15508266deff2a8d6c84 +refs/heads/master: 1fb4dc5c39af941d3abc597337e0ea776bfce0f2 diff --git a/trunk/arch/metag/kernel/perf/perf_event.c b/trunk/arch/metag/kernel/perf/perf_event.c index 54fde35b4b9c..a1eff3687e8e 100644 --- a/trunk/arch/metag/kernel/perf/perf_event.c +++ b/trunk/arch/metag/kernel/perf/perf_event.c @@ -617,9 +617,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx) WARN_ONCE((config != 0x100), "invalid configuration (%d) for counter (%d)\n", config, idx); - - /* Reset the cycle count */ - __core_reg_set(TXTACTCYC, 0); + local64_set(&event->prev_count, __core_reg_get(TXTACTCYC)); goto unlock; } @@ -708,9 +706,8 @@ static u64 metag_pmu_read_counter(int idx) { u32 tmp = 0; - /* The act of reading the cycle counter also clears it */ if (METAG_INST_COUNTER == idx) { - __core_reg_swap(TXTACTCYC, tmp); + tmp = __core_reg_get(TXTACTCYC); goto out; }