Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[mirror_ubuntu-bionic-kernel.git] / drivers / pci / host / pci-hyperv.c

diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c
index e7d94473aedd0b6c580e0581c18cdccd01946f2a..6b8d060d07de7d8ba2fc66dd3a0b0087470f4b82 100644 (file)
--- a/drivers/pci/host/pci-hyperv.c
+++ b/drivers/pci/host/pci-hyperv.c
@@ -879,7 +879,7 @@ static void hv_irq_unmask(struct irq_data *data)
        int cpu;
        u64 res;
 
-       dest = irq_data_get_affinity_mask(data);
+       dest = irq_data_get_effective_affinity_mask(data);
        pdev = msi_desc_to_pci_dev(msi_desc);
        pbus = pdev->bus;
        hbus = container_of(pbus->sysdata, struct hv_pcibus_device, sysdata);
@@ -1038,6 +1038,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
        struct hv_pci_dev *hpdev;
        struct pci_bus *pbus;
        struct pci_dev *pdev;
+       struct cpumask *dest;
        struct compose_comp_ctxt comp;
        struct tran_int_desc *int_desc;
        struct {
@@ -1052,6 +1053,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
        int ret;
 
        pdev = msi_desc_to_pci_dev(irq_data_get_msi_desc(data));
+       dest = irq_data_get_effective_affinity_mask(data);
        pbus = pdev->bus;
        hbus = container_of(pbus->sysdata, struct hv_pcibus_device, sysdata);
        hpdev = get_pcichild_wslot(hbus, devfn_to_wslot(pdev->devfn));
@@ -1077,14 +1079,14 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
        switch (pci_protocol_version) {
        case PCI_PROTOCOL_VERSION_1_1:
                size = hv_compose_msi_req_v1(&ctxt.int_pkts.v1,
-                                       irq_data_get_affinity_mask(data),
+                                       dest,
                                        hpdev->desc.win_slot.slot,
                                        cfg->vector);
                break;
 
        case PCI_PROTOCOL_VERSION_1_2:
                size = hv_compose_msi_req_v2(&ctxt.int_pkts.v2,
-                                       irq_data_get_affinity_mask(data),
+                                       dest,
                                        hpdev->desc.win_slot.slot,
                                        cfg->vector);
                break;