Merge tag 'devicetree-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / arch / arm64 / kernel / smp.c

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index c5cebc4..27df5c1 100644 (file)
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -1101,5 +1101,6 @@ bool cpus_are_stuck_in_kernel(void)
 {
        bool smp_spin_tables = (num_possible_cpus() > 1 && !have_cpu_die());
 
-       return !!cpus_stuck_in_kernel || smp_spin_tables;
+       return !!cpus_stuck_in_kernel || smp_spin_tables ||
+               is_protected_kvm_enabled();
 }