Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-block.git] / virt / kvm / arm / arm.c

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index 92b95ae9a2ca04b5a474201e0908d265973b1959..94a36f6bd0ef8bcf60db0c6cd1d2dc2524529f5a 100644 (file)
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -1389,7 +1389,7 @@ static int init_subsystems(void)
        /*
         * Init HYP architected timer support
         */
-       err = kvm_timer_hyp_init();
+       err = kvm_timer_hyp_init(vgic_present);
        if (err)
                goto out;