diff options
| author | David S. Miller | 2006-02-14 23:12:44 +0100 |
|---|---|---|
| committer | David S. Miller | 2006-03-20 10:12:54 +0100 |
| commit | e7093703d912254b5667dfe851a6d0f7e664f9df (patch) | |
| tree | 9560b13ae240f6e3b0b1a3fd08ff8ab829b27d13 /arch/sparc64/kernel/pci_common.c | |
| parent | [SPARC64]: Kill sun4v_register_fault_status() on SMP. (diff) | |
| download | kernel-qcow2-linux-e7093703d912254b5667dfe851a6d0f7e664f9df.tar.gz kernel-qcow2-linux-e7093703d912254b5667dfe851a6d0f7e664f9df.tar.xz kernel-qcow2-linux-e7093703d912254b5667dfe851a6d0f7e664f9df.zip | |
[SPARC64]: INO is never fully specified already on SUN4V.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci_common.c')
| -rw-r--r-- | arch/sparc64/kernel/pci_common.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c index 58310aacea28..1b1f89b35f67 100644 --- a/arch/sparc64/kernel/pci_common.c +++ b/arch/sparc64/kernel/pci_common.c @@ -703,16 +703,18 @@ static void __init pdev_fixup_irq(struct pci_dev *pdev) return; } - /* Fully specified already? */ - if (((prom_irq & PCI_IRQ_IGN) >> 6) == portid) { - pdev->irq = p->irq_build(pbm, pdev, prom_irq); - goto have_irq; - } + if (tlb_type != hypervisor) { + /* Fully specified already? */ + if (((prom_irq & PCI_IRQ_IGN) >> 6) == portid) { + pdev->irq = p->irq_build(pbm, pdev, prom_irq); + goto have_irq; + } - /* An onboard device? (bit 5 set) */ - if ((prom_irq & PCI_IRQ_INO) & 0x20) { - pdev->irq = p->irq_build(pbm, pdev, (portid << 6 | prom_irq)); - goto have_irq; + /* An onboard device? (bit 5 set) */ + if ((prom_irq & PCI_IRQ_INO) & 0x20) { + pdev->irq = p->irq_build(pbm, pdev, (portid << 6 | prom_irq)); + goto have_irq; + } } /* Can we find a matching entry in the interrupt-map? */ |