From bd4179e57770af4e9cfd59e72f4a7369f05d74fc Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Fri, 25 Mar 2011 13:12:23 +0100 Subject: [PATCH] --- yaml --- r: 243438 b: refs/heads/master c: d25d3b4c4d0e27975ee659a64b6d29f02fdbfde4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/perf_event_v7.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 29882584474f..7eeac41bbaa4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb4fe87d79511398a68000d2100c825f54b51652 +refs/heads/master: d25d3b4c4d0e27975ee659a64b6d29f02fdbfde4 diff --git a/trunk/arch/arm/kernel/perf_event_v7.c b/trunk/arch/arm/kernel/perf_event_v7.c index 2e1402556fa0..d6c9dcd1979f 100644 --- a/trunk/arch/arm/kernel/perf_event_v7.c +++ b/trunk/arch/arm/kernel/perf_event_v7.c @@ -466,6 +466,7 @@ static inline unsigned long armv7_pmnc_read(void) static inline void armv7_pmnc_write(unsigned long val) { val &= ARMV7_PMNC_MASK; + isb(); asm volatile("mcr p15, 0, %0, c9, c12, 0" : : "r"(val)); } @@ -502,6 +503,7 @@ static inline int armv7_pmnc_select_counter(unsigned int idx) val = (idx - ARMV7_EVENT_CNT_TO_CNTx) & ARMV7_SELECT_MASK; asm volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (val)); + isb(); return idx; }