diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index c1ae17f68a05ce0cab028f9982931529b7e706ec..7cf274e6966e6a2f79bc2fe65f8dc916b8cdb6f2 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -466,6 +466,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 	kvm_vgic_put(vcpu);
 	kvm_vcpu_pmu_restore_host(vcpu);
 
+	vcpu->pre_pcpu = vcpu->cpu;
 	vcpu->cpu = -1;
 
 	kvm_arm_set_running_vcpu(NULL);