diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-01-06 12:07:10 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-01-06 12:07:10 +0100 |
commit | b6815f354518591400ce4c3a5fd63337643710ff (patch) | |
tree | 14f8a117b4556f7dba5a5a9ccebc5e3b204cbd56 /drivers/pci/host/pci-hyperv.c | |
parent | a0a8f2ada3f50f0190ebcbb60e77e697444c470e (diff) | |
parent | 89876f275e8d562912d9c238cd888b52065cf25c (diff) | |
download | talos-obmc-linux-b6815f354518591400ce4c3a5fd63337643710ff.tar.gz talos-obmc-linux-b6815f354518591400ce4c3a5fd63337643710ff.zip |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pci/host/pci-hyperv.c')
-rw-r--r-- | drivers/pci/host/pci-hyperv.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c index 04dac6a42c9f..6b8d060d07de 100644 --- a/drivers/pci/host/pci-hyperv.c +++ b/drivers/pci/host/pci-hyperv.c @@ -985,9 +985,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->int_desc.delivery_mode = - (apic->irq_delivery_mode == dest_LowestPrio) ? - dest_LowestPrio : dest_Fixed; + int_pkt->int_desc.delivery_mode = dest_Fixed; /* * Create MSI w/ dummy vCPU set, overwritten by subsequent retarget in @@ -1008,9 +1006,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->int_desc.delivery_mode = - (apic->irq_delivery_mode == dest_LowestPrio) ? - dest_LowestPrio : dest_Fixed; + int_pkt->int_desc.delivery_mode = dest_Fixed; /* * Create MSI w/ dummy vCPU set targeting just one vCPU, overwritten |