1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 5152b3898155..4814446a0024 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -468,11 +468,11 @@ static struct cyclecounter cyclecounter = {
         .mask   = CLOCKSOURCE_MASK(56),
 };
 
-static struct timecounter timecounter;
+static struct arch_timer_kvm_info arch_timer_kvm_info;
 
-struct timecounter *arch_timer_get_timecounter(void)
+struct arch_timer_kvm_info *arch_timer_get_kvm_info(void)
 {
-        return &timecounter;
+        return &arch_timer_kvm_info;
 }
 
 static void __init arch_counter_register(unsigned type)
@@ -500,7 +500,8 @@ static void __init arch_counter_register(unsigned type)
         clocksource_register_hz(&clocksource_counter, arch_timer_rate);
         cyclecounter.mult = clocksource_counter.mult;
         cyclecounter.shift = clocksource_counter.shift;
-        timecounter_init(&timecounter, &cyclecounter, start_count);
+        timecounter_init(&arch_timer_kvm_info.timecounter,
+                         &cyclecounter, start_count);
 
         /* 56 bits minimum, so we assume worst case rollover */
         sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate);
@@ -744,6 +745,8 @@ static void __init arch_timer_init(void)
 
         arch_timer_register();
         arch_timer_common_init();
+
+        arch_timer_kvm_info.virtual_irq = arch_timer_ppi[VIRT_PPI];
 }
 
 static void __init arch_timer_of_init(struct device_node *np)