aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm/arm.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/kvm/arm.c')
-rw-r--r--arch/arm/kvm/arm.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index c1a11496817b..40bc3df6d87b 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -261,16 +261,9 @@ int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
261 261
262int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 262int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
263{ 263{
264 int ret;
265
266 /* Force users to call KVM_ARM_VCPU_INIT */ 264 /* Force users to call KVM_ARM_VCPU_INIT */
267 vcpu->arch.target = -1; 265 vcpu->arch.target = -1;
268 266
269 /* Set up VGIC */
270 ret = kvm_vgic_vcpu_init(vcpu);
271 if (ret)
272 return ret;
273
274 /* Set up the timer */ 267 /* Set up the timer */
275 kvm_timer_vcpu_init(vcpu); 268 kvm_timer_vcpu_init(vcpu);
276 269