KVM: arm64: Make timer_set_offset() generally accessible

Move the timer_set_offset() helper to arm_arch_timer.h, so that it
is next to timer_get_offset(), and accessible by the rest of KVM.

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c
index c832c293676a32ebf06293d1856dd191f5758f19..27662a3a3043e7eb132bd55407e400f1c7878da0 100644 (file)
--- a/arch/arm64/kvm/arch_timer.c
+++ b/arch/arm64/kvm/arch_timer.c
@@ -146,16 +146,6 @@ static void timer_set_cval(struct arch_timer_context *ctxt, u64 cval)
        }
 }
 
-static void timer_set_offset(struct arch_timer_context *ctxt, u64 offset)
-{
-       if (!ctxt->offset.vm_offset) {
-               WARN(offset, "timer %d\n", arch_timer_ctx_index(ctxt));
-               return;
-       }
-
-       WRITE_ONCE(*ctxt->offset.vm_offset, offset);
-}
-
 u64 kvm_phys_timer_read(void)
 {
        return timecounter->cc->read(timecounter->cc);

diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h
index d8e400cb2bfff40aa8beb404fb4833680fc62794..5f7f2ed8817c5d793c951f658aea53bc2423c139 100644 (file)
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
@@ -179,4 +179,14 @@ static inline u64 timer_get_offset(struct arch_timer_context *ctxt)
        return offset;
 }
 
+static inline void timer_set_offset(struct arch_timer_context *ctxt, u64 offset)
+{
+       if (!ctxt->offset.vm_offset) {
+               WARN(offset, "timer %d\n", arch_timer_ctx_index(ctxt));
+               return;
+       }
+
+       WRITE_ONCE(*ctxt->offset.vm_offset, offset);
+}
+
 #endif