1 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 631e6bd0e05f..78c0885d6501 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -124,6 +124,10 @@ static void reset_l2ctlr(struct kvm_vcpu *vcpu, const struct coproc_reg *r)
         asm volatile("mrc p15, 1, %0, c9, c0, 2\n" : "=r" (l2ctlr));
         l2ctlr &= ~(3 << 24);
         ncores = atomic_read(&vcpu->kvm->online_vcpus) - 1;
+        /* How many cores in the current cluster and the next ones */
+        ncores -= (vcpu->vcpu_id & ~3);
+        /* Cap it to the maximum number of cores in a single cluster */
+        ncores = min(ncores, 3U);
         l2ctlr |= (ncores & 3) << 24;
 
         vcpu->arch.cp15[c9_L2CTLR] = l2ctlr;