From 081a4910d977525c0f97040b7c2c79595c9c5715 Mon Sep 17 00:00:00 2001
From: Mark Rutland <mark.rutland@arm.com>
Date: Tue, 15 Jan 2013 11:12:29 +0000
Subject: [PATCH] --- yaml --- r: 355826 b: refs/heads/master c:
 1dac0dd71cdda2bd7395dd47a6b617ed296d4901 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm64/include/asm/arm_generic.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 62247010288d..42c0b7adeb9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a4da6e36c582ff746191eca85b6c1c068dbfbd6
+refs/heads/master: 1dac0dd71cdda2bd7395dd47a6b617ed296d4901
diff --git a/trunk/arch/arm64/include/asm/arm_generic.h b/trunk/arch/arm64/include/asm/arm_generic.h
index df2aeb82f74e..6ece2f107fa0 100644
--- a/trunk/arch/arm64/include/asm/arm_generic.h
+++ b/trunk/arch/arm64/include/asm/arm_generic.h
@@ -83,6 +83,7 @@ static inline cycle_t arch_counter_get_cntpct(void)
 {
 	cycle_t cval;
 
+	isb();
 	asm volatile("mrs %0, cntpct_el0" : "=r" (cval));
 
 	return cval;
@@ -92,6 +93,7 @@ static inline cycle_t arch_counter_get_cntvct(void)
 {
 	cycle_t cval;
 
+	isb();
 	asm volatile("mrs %0, cntvct_el0" : "=r" (cval));
 
 	return cval;