fixup! KVM: arm64: vgic-v3: Add userspace selection for GICv3.3 NMI
diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c
index f6d4f40..23b2a3d 100644
--- a/arch/arm64/kvm/vgic/vgic-init.c
+++ b/arch/arm64/kvm/vgic/vgic-init.c
@@ -323,8 +323,16 @@
* If userspace didn't set the GIC implementation revision,
* default to the latest and greatest. You know want it.
*/
- if (!dist->implementation_rev)
+ if (!dist->implementation_rev) {
dist->implementation_rev = KVM_VGIC_IMP_REV_LATEST;
+ /*
+ * Advertise NMI if available. Userspace that explicitly
+ * doesn't want NMI will have written to GICD_{IIDR,TYPER}
+ * to set the implementation and the NMI support status.
+ */
+ dist->has_nmi = kvm_vgic_global_state.has_nmi;
+ }
+
dist->initialized = true;
out:
