---

yaml --- r: 355826 b: refs/heads/master c: 1dac0dd h: refs/heads/master v: v3
git-mirror · Jan 31, 2013 · 081a491 · 081a491
1 parent 4dd1e87
commit 081a491
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;