diff options
-rw-r--r-- | arch/x86/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/kernel/apic/msi.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 64e99d3c5169..ea4bedaba4b8 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -95,6 +95,7 @@ config X86 | |||
95 | select GENERIC_IRQ_MATRIX_ALLOCATOR if X86_LOCAL_APIC | 95 | select GENERIC_IRQ_MATRIX_ALLOCATOR if X86_LOCAL_APIC |
96 | select GENERIC_IRQ_MIGRATION if SMP | 96 | select GENERIC_IRQ_MIGRATION if SMP |
97 | select GENERIC_IRQ_PROBE | 97 | select GENERIC_IRQ_PROBE |
98 | select GENERIC_IRQ_RESERVATION_MODE | ||
98 | select GENERIC_IRQ_SHOW | 99 | select GENERIC_IRQ_SHOW |
99 | select GENERIC_PENDING_IRQ if SMP | 100 | select GENERIC_PENDING_IRQ if SMP |
100 | select GENERIC_SMP_IDLE_THREAD | 101 | select GENERIC_SMP_IDLE_THREAD |
diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index 5b6dd1a85ec4..9b18be764422 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c | |||
@@ -129,7 +129,7 @@ static struct msi_domain_ops pci_msi_domain_ops = { | |||
129 | 129 | ||
130 | static struct msi_domain_info pci_msi_domain_info = { | 130 | static struct msi_domain_info pci_msi_domain_info = { |
131 | .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | | 131 | .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | |
132 | MSI_FLAG_PCI_MSIX | MSI_FLAG_MUST_REACTIVATE, | 132 | MSI_FLAG_PCI_MSIX, |
133 | .ops = &pci_msi_domain_ops, | 133 | .ops = &pci_msi_domain_ops, |
134 | .chip = &pci_msi_controller, | 134 | .chip = &pci_msi_controller, |
135 | .handler = handle_edge_irq, | 135 | .handler = handle_edge_irq, |
@@ -167,8 +167,7 @@ static struct irq_chip pci_msi_ir_controller = { | |||
167 | 167 | ||
168 | static struct msi_domain_info pci_msi_ir_domain_info = { | 168 | static struct msi_domain_info pci_msi_ir_domain_info = { |
169 | .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | | 169 | .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | |
170 | MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX | | 170 | MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX, |
171 | MSI_FLAG_MUST_REACTIVATE, | ||
172 | .ops = &pci_msi_domain_ops, | 171 | .ops = &pci_msi_domain_ops, |
173 | .chip = &pci_msi_ir_controller, | 172 | .chip = &pci_msi_ir_controller, |
174 | .handler = handle_edge_irq, | 173 | .handler = handle_edge_irq, |