Commit 332f3f1d authored by David S. Miller's avatar David S. Miller

Do the slot mapping adjustment to PROM interrupt

property in pci_intmap_match even if pbm->num_pbm_intmap is
zero.
parent ffe536ba
......@@ -573,9 +573,6 @@ static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt
unsigned int hi, mid, lo, irq;
int i, num_intmap, map_slot;
if (pbm->num_pbm_intmap == 0)
return 0;
intmap = &pbm->pbm_intmap[0];
intmask = &pbm->pbm_intmask;
num_intmap = pbm->num_pbm_intmap;
......@@ -673,6 +670,11 @@ static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt
}
}
/* We will run this code even if pbm->num_pbm_intmap is zero, just so
* we can apply the slot mapping to the PROM interrupt property value.
* So do not spit out these warnings in that case.
*/
if (num_intmap != 0) {
/* Print it both to OBP console and kernel one so that if bootup
* hangs here the user has the information to report.
*/
......@@ -687,6 +689,7 @@ static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt
printk("IRQ [%08x.%08x.%08x.%08x] not found in interrupt-map\n",
pregs->phys_hi, pregs->phys_mid, pregs->phys_lo, *interrupt);
printk("Please email this information to davem@redhat.com\n");
}
return 0;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment