diff options
Diffstat (limited to 'arch/x86/pci')
-rw-r--r-- | arch/x86/pci/xen.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index 48e8461057ba..5eee4959785d 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c | |||
@@ -382,7 +382,14 @@ static void xen_teardown_msi_irq(unsigned int irq) | |||
382 | { | 382 | { |
383 | xen_destroy_irq(irq); | 383 | xen_destroy_irq(irq); |
384 | } | 384 | } |
385 | 385 | static u32 xen_nop_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag) | |
386 | { | ||
387 | return 0; | ||
388 | } | ||
389 | static u32 xen_nop_msix_mask_irq(struct msi_desc *desc, u32 flag) | ||
390 | { | ||
391 | return 0; | ||
392 | } | ||
386 | #endif | 393 | #endif |
387 | 394 | ||
388 | int __init pci_xen_init(void) | 395 | int __init pci_xen_init(void) |
@@ -406,6 +413,8 @@ int __init pci_xen_init(void) | |||
406 | x86_msi.setup_msi_irqs = xen_setup_msi_irqs; | 413 | x86_msi.setup_msi_irqs = xen_setup_msi_irqs; |
407 | x86_msi.teardown_msi_irq = xen_teardown_msi_irq; | 414 | x86_msi.teardown_msi_irq = xen_teardown_msi_irq; |
408 | x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs; | 415 | x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs; |
416 | x86_msi.msi_mask_irq = xen_nop_msi_mask_irq; | ||
417 | x86_msi.msix_mask_irq = xen_nop_msix_mask_irq; | ||
409 | #endif | 418 | #endif |
410 | return 0; | 419 | return 0; |
411 | } | 420 | } |
@@ -485,6 +494,8 @@ int __init pci_xen_initial_domain(void) | |||
485 | x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs; | 494 | x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs; |
486 | x86_msi.teardown_msi_irq = xen_teardown_msi_irq; | 495 | x86_msi.teardown_msi_irq = xen_teardown_msi_irq; |
487 | x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs; | 496 | x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs; |
497 | x86_msi.msi_mask_irq = xen_nop_msi_mask_irq; | ||
498 | x86_msi.msix_mask_irq = xen_nop_msix_mask_irq; | ||
488 | #endif | 499 | #endif |
489 | xen_setup_acpi_sci(); | 500 | xen_setup_acpi_sci(); |
490 | __acpi_register_gsi = acpi_register_gsi_xen; | 501 | __acpi_register_gsi = acpi_register_gsi_xen; |