Merge tag 'lkdtm-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...

[linux-2.6-microblaze.git] / arch / x86 / pci / xen.c

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 9bb1e29..b94f727 100644 (file)
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -467,7 +467,6 @@ static __init void xen_setup_pci_msi(void)
                else
                        xen_msi_ops.setup_msi_irqs = xen_setup_msi_irqs;
                xen_msi_ops.teardown_msi_irqs = xen_pv_teardown_msi_irqs;
-               pci_msi_ignore_mask = 1;
        } else if (xen_hvm_domain()) {
                xen_msi_ops.setup_msi_irqs = xen_hvm_setup_msi_irqs;
                xen_msi_ops.teardown_msi_irqs = xen_teardown_msi_irqs;
@@ -481,6 +480,11 @@ static __init void xen_setup_pci_msi(void)
         * in allocating the native domain and never use it.
         */
        x86_init.irqs.create_pci_msi_domain = xen_create_pci_msi_domain;
+       /*
+        * With XEN PIRQ/Eventchannels in use PCI/MSI[-X] masking is solely
+        * controlled by the hypervisor.
+        */
+       pci_msi_ignore_mask = 1;
 }
 
 #else /* CONFIG_PCI_MSI */