summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-11-29 22:48:31 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2012-12-05 11:20:04 +0000
commit1f75ff0a3d63606c1345e316e88a903fd43ca8be (patch)
treed326cb2f58040c910390e80f5a5287b0074a0276 /drivers/clocksource
parent45a7905fc48f6079932e77d64237cf7f008db5f4 (diff)
downloadlinux-3.10-1f75ff0a3d63606c1345e316e88a903fd43ca8be.tar.gz
linux-3.10-1f75ff0a3d63606c1345e316e88a903fd43ca8be.tar.bz2
linux-3.10-1f75ff0a3d63606c1345e316e88a903fd43ca8be.zip
arm64: generic timer: use virtual counter instead of physical at EL0
We want to use the virtual counter at EL0, as the physical counter may not track the current clocksource for guests running under a hypervisor. This patch updates the vdso and generic timer driver to use the virtual counter. The kernel EL2 entry code is also updated to ensure that the virtual offset is initialised to zero. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/arm_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/arm_generic.c b/drivers/clocksource/arm_generic.c
index c4d9f9566c6..df5d7e8e5b8 100644
--- a/drivers/clocksource/arm_generic.c
+++ b/drivers/clocksource/arm_generic.c
@@ -109,7 +109,7 @@ static void __cpuinit arch_timer_setup(struct clock_event_device *clk)
enable_percpu_irq(clk->irq, 0);
- /* Ensure the physical counter is visible to userspace for the vDSO. */
+ /* Ensure the virtual counter is visible to userspace for the vDSO. */
arch_counter_enable_user_access();
}