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/kernel | |
| parent | 3fbd55ec21e698221ffb43526090137b07c32586 (diff) | |
| parent | 3f71be237ce37e0131973ebfa33b326bc51d743e (diff) | |
| download | op-kernel-dev-fd8957a96d535a992067b2c206672323a885454a.zip op-kernel-dev-fd8957a96d535a992067b2c206672323a885454a.tar.gz | |
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/kernel')
| -rw-r--r-- | arch/arm/kernel/hyp-stub.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 1315c4c..4910232 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -153,6 +153,13 @@ THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE mrc p15, 4, r7, c14, c1, 0 @ CNTHCTL orr r7, r7, #3 @ PL1PCEN | PL1PCTEN mcr p15, 4, r7, c14, c1, 0 @ CNTHCTL + mov r7, #0 + mcrr p15, 4, r7, r7, c14 @ CNTVOFF + + @ Disable virtual timer in case it was counting + mrc p15, 0, r7, c14, c3, 1 @ CNTV_CTL + bic r7, #1 @ Clear ENABLE + mcr p15, 0, r7, c14, c3, 1 @ CNTV_CTL 1: #endif |
