diff options
| author | Jiang Liu <[email protected]> | 2014-06-09 16:20:00 +0800 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2014-06-21 23:05:43 +0200 |
| commit | 9506063992cc0785246fd314a4a40b6314685aa8 (patch) | |
| tree | bfaa0ddd25db04263085c1cb457add5565d88223 | |
| parent | d7b830013f59cf586c1cec3caa1ce7156da59a13 (diff) | |
x86, irq, mpparse: Use common irqdomain map interface to program IOAPIC pins
Refine mpparse to use common irqdomain map interface to program IOAPIC pins,
so we can unify the callsite to progam IOAPIC pins.
Signed-off-by: Jiang Liu <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Joerg Roedel <[email protected]>
Cc: Paul Gortmaker <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: Rafael J. Wysocki <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: Randy Dunlap <[email protected]>
Cc: Yinghai Lu <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
| -rw-r--r-- | arch/x86/kernel/mpparse.c | 4 | ||||
| -rw-r--r-- | arch/x86/pci/irq.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 13c8e1f864fc..faf503aa3b70 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -113,7 +113,9 @@ static void __init MP_bus_info(struct mpc_bus *m) pr_warn("Unknown bustype %s - ignoring\n", str); } -static struct irq_domain_ops mp_ioapic_irqdomain_ops; +static struct irq_domain_ops mp_ioapic_irqdomain_ops = { + .map = mp_irqdomain_map, +}; static void __init MP_ioapic_info(struct mpc_ioapic *m) { diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 84112f55dd7a..e4200e5e775e 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -1227,8 +1227,6 @@ static int pirq_enable_irq(struct pci_dev *dev) } dev = temp_dev; if (irq >= 0) { - io_apic_set_pci_routing(&dev->dev, irq, - &irq_attr); dev->irq = irq; dev_info(&dev->dev, "PCI->APIC IRQ transform: " "INT %c -> IRQ %d\n", 'A' + pin - 1, irq); |