Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[karo-tx-linux.git] / include / kvm / arm_arch_timer.h

diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h
index b651aed9dc6b9084ed2dcae8832a033217d4dca4..dda39d8fa189b50d897c7c59bbba5b1f8bdab649 100644 (file)
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
@@ -24,9 +24,6 @@
 #include <linux/workqueue.h>
 
 struct arch_timer_kvm {
-       /* Is the timer enabled */
-       bool                    enabled;
-
        /* Virtual offset */
        cycle_t                 cntvoff;
 };
@@ -53,15 +50,15 @@ struct arch_timer_cpu {
        /* Timer IRQ */
        struct kvm_irq_level            irq;
 
-       /* VGIC mapping */
-       struct irq_phys_map             *map;
-
        /* Active IRQ state caching */
        bool                            active_cleared_last;
+
+       /* Is the timer enabled */
+       bool                    enabled;
 };
 
 int kvm_timer_hyp_init(void);
-void kvm_timer_enable(struct kvm *kvm);
+int kvm_timer_enable(struct kvm_vcpu *vcpu);
 void kvm_timer_init(struct kvm *kvm);
 int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
                         const struct kvm_irq_level *irq);