Merge tag 'kvm-4.15-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-block.git] / drivers / irqchip / irq-gic-v3.c

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index b54b55597ffb9c8351ff98e97dc05535503ec493..17221143f5057ce35f84f6021bf972f32b61bc48 100644 (file)
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1260,7 +1260,9 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare
                goto out_unmap_rdist;
 
        gic_populate_ppi_partitions(node);
-       gic_of_setup_kvm_info(node);
+
+       if (static_key_true(&supports_deactivate))
+               gic_of_setup_kvm_info(node);
        return 0;
 
 out_unmap_rdist:
@@ -1549,7 +1551,9 @@ gic_acpi_init(struct acpi_subtable_header *header, const unsigned long end)
                goto out_fwhandle_free;
 
        acpi_set_irq_model(ACPI_IRQ_MODEL_GIC, domain_handle);
-       gic_acpi_setup_kvm_info();
+
+       if (static_key_true(&supports_deactivate))
+               gic_acpi_setup_kvm_info();
 
        return 0;