diff options
-rw-r--r-- | arch/metag/kernel/perf/perf_event.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/metag/kernel/perf/perf_event.c b/arch/metag/kernel/perf/perf_event.c index 54fde35b4b9c..a1eff3687e8e 100644 --- a/arch/metag/kernel/perf/perf_event.c +++ b/arch/metag/kernel/perf/perf_event.c | |||
@@ -617,9 +617,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx) | |||
617 | WARN_ONCE((config != 0x100), | 617 | WARN_ONCE((config != 0x100), |
618 | "invalid configuration (%d) for counter (%d)\n", | 618 | "invalid configuration (%d) for counter (%d)\n", |
619 | config, idx); | 619 | config, idx); |
620 | 620 | local64_set(&event->prev_count, __core_reg_get(TXTACTCYC)); | |
621 | /* Reset the cycle count */ | ||
622 | __core_reg_set(TXTACTCYC, 0); | ||
623 | goto unlock; | 621 | goto unlock; |
624 | } | 622 | } |
625 | 623 | ||
@@ -708,9 +706,8 @@ static u64 metag_pmu_read_counter(int idx) | |||
708 | { | 706 | { |
709 | u32 tmp = 0; | 707 | u32 tmp = 0; |
710 | 708 | ||
711 | /* The act of reading the cycle counter also clears it */ | ||
712 | if (METAG_INST_COUNTER == idx) { | 709 | if (METAG_INST_COUNTER == idx) { |
713 | __core_reg_swap(TXTACTCYC, tmp); | 710 | tmp = __core_reg_get(TXTACTCYC); |
714 | goto out; | 711 | goto out; |
715 | } | 712 | } |
716 | 713 | ||