1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index f641e8e2c78d..121af5cf688f 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1420,7 +1420,8 @@ static void __init gic_of_setup_kvm_info(struct device_node *node)
         if (ret)
                 return;
 
-        gic_set_kvm_info(&gic_v2_kvm_info);
+        if (static_key_true(&supports_deactivate))
+                gic_set_kvm_info(&gic_v2_kvm_info);
 }
 
 int __init
@@ -1652,7 +1653,8 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header,
         if (IS_ENABLED(CONFIG_ARM_GIC_V2M))
                 gicv2m_init(NULL, gic_data[0].domain);
 
-        gic_acpi_setup_kvm_info();
+        if (static_key_true(&supports_deactivate))
+                gic_acpi_setup_kvm_info();
 
         return 0;
 }