diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 20:12:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 20:12:56 +0100 |
| commit | fd8957a96d535a992067b2c206672323a885454a (patch) | |
| tree | 136bedf882a14924f76f059977e40eda038ae5c9 /arch/arm/include/asm | |
| parent | Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable (diff) | |
| parent | ARM: arch_timer: stop virtual timer when booted in HYP mode (diff) | |
| download | linux-dev-fd8957a96d535a992067b2c206672323a885454a.tar.xz linux-dev-fd8957a96d535a992067b2c206672323a885454a.zip | |
Merge branch 'for-rmk/arch-timer-cleanups' of git://linux-arm.org/linux-mr into devel-stable
Please pull these arch_timer cleanups I've been holding onto for a while.
They're the same as my last posting [1], but have been rebased to v3.10-rc3.
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-May/170602.html
-- Mark Rutland
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/arch_timer.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h index 7c1bfc0aea0c..accefe099182 100644 --- a/arch/arm/include/asm/arch_timer.h +++ b/arch/arm/include/asm/arch_timer.h @@ -80,15 +80,6 @@ static inline u32 arch_timer_get_cntfrq(void) return val; } -static inline u64 arch_counter_get_cntpct(void) -{ - u64 cval; - - isb(); - asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (cval)); - return cval; -} - static inline u64 arch_counter_get_cntvct(void) { u64 cval; |