KVM: x86: fix CPUID entries returned by KVM_GET_CPUID2 ioctl

[linux.git] / drivers / pci / controller / pci-hyperv.c

diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 03ed5cb1c4b25224b7175fe7fca4dbe1745e1527..6db8d96a78ebcae34c16d9cc8a039ad68882555e 100644 (file)
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -1226,7 +1226,7 @@ static void hv_irq_unmask(struct irq_data *data)
        params->int_target.vector = cfg->vector;
 
        /*
        params->int_target.vector = cfg->vector;
 
        /*

-        * Honoring apic->irq_delivery_mode set to dest_Fixed by
+        * Honoring apic->delivery_mode set to APIC_DELIVERY_MODE_FIXED by

         * setting the HV_DEVICE_INTERRUPT_TARGET_MULTICAST flag results in a
         * spurious interrupt storm. Not doing so does not seem to have a
         * negative effect (yet?).
         * setting the HV_DEVICE_INTERRUPT_TARGET_MULTICAST flag results in a
         * spurious interrupt storm. Not doing so does not seem to have a
         * negative effect (yet?).


@@ -1324,7 +1324,7 @@ static u32 hv_compose_msi_req_v1(
        int_pkt->wslot.slot = slot;
        int_pkt->int_desc.vector = vector;
        int_pkt->int_desc.vector_count = 1;
        int_pkt->wslot.slot = slot;
        int_pkt->int_desc.vector = vector;
        int_pkt->int_desc.vector_count = 1;

-       int_pkt->int_desc.delivery_mode = dest_Fixed;
+       int_pkt->int_desc.delivery_mode = APIC_DELIVERY_MODE_FIXED;

 
        /*
         * Create MSI w/ dummy vCPU set, overwritten by subsequent retarget in
 
        /*
         * Create MSI w/ dummy vCPU set, overwritten by subsequent retarget in


@@ -1345,7 +1345,7 @@ static u32 hv_compose_msi_req_v2(
        int_pkt->wslot.slot = slot;
        int_pkt->int_desc.vector = vector;
        int_pkt->int_desc.vector_count = 1;
        int_pkt->wslot.slot = slot;
        int_pkt->int_desc.vector = vector;
        int_pkt->int_desc.vector_count = 1;

-       int_pkt->int_desc.delivery_mode = dest_Fixed;
+       int_pkt->int_desc.delivery_mode = APIC_DELIVERY_MODE_FIXED;

 
        /*
         * Create MSI w/ dummy vCPU set targeting just one vCPU, overwritten
 
        /*
         * Create MSI w/ dummy vCPU set targeting just one vCPU, overwritten