Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 355822
b: refs/heads/master
c: 4580104
h: refs/heads/master
v: v3
  • Loading branch information
Mark Rutland committed Jan 31, 2013
1 parent fcea741 commit 69c38bb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec944c93a293bee6b4cc6b6f1c9560526c7ed635
refs/heads/master: 45801042225c66a66fb2cb50fae6ff71883a99d6
4 changes: 4 additions & 0 deletions trunk/arch/arm/include/asm/arch_timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ static inline void arch_timer_reg_write(const int access, const int reg, u32 val
break;
}
}

isb();
}

static inline u32 arch_timer_reg_read(const int access, const int reg)
Expand Down Expand Up @@ -91,6 +93,7 @@ static inline u64 arch_counter_get_cntpct(void)
{
u64 cval;

isb();
asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (cval));
return cval;
}
Expand All @@ -99,6 +102,7 @@ static inline u64 arch_counter_get_cntvct(void)
{
u64 cval;

isb();
asm volatile("mrrc p15, 1, %Q0, %R0, c14" : "=r" (cval));
return cval;
}
Expand Down

0 comments on commit 69c38bb

Please sign in to comment.