From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 3 Jul 2012 09:52:29 +0000 (+0100)
Subject: arm: the hyp timer seems to work in newer model versions, default to using it.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8220
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=20a13e3fb4a44c9be07a4d956275c682c55f86b1;p=xen.git

arm: the hyp timer seems to work in newer model versions, default to using it.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 437dc71234..1587fa2fb5 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -27,8 +27,12 @@
 #include <xen/time.h>
 #include <asm/system.h>
 
-/* Unfortunately the hypervisor timer interrupt appears to be buggy */
-#define USE_HYP_TIMER 0
+/*
+ * Unfortunately the hypervisor timer interrupt appears to be buggy in
+ * some versions of the model. Disable this to use the physical timer
+ * instead.
+ */
+#define USE_HYP_TIMER 1
 
 /* For fine-grained timekeeping, we use the ARM "Generic Timer", a
  * register-mapped time source in the SoC. */