diff --git a/[refs] b/[refs]
index 5ea210e53a35..2c0a8a367d3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab66a50e31deb48b0444c248e67e5aa3217efda5
+refs/heads/master: 63c2a0e598c2fa769a08a6e9ad124bf270b4436e
diff --git a/trunk/arch/sparc64/kernel/pci_common.c b/trunk/arch/sparc64/kernel/pci_common.c
index b2d21b11a232..ab6a2e1b76fb 100644
--- a/trunk/arch/sparc64/kernel/pci_common.c
+++ b/trunk/arch/sparc64/kernel/pci_common.c
@@ -581,18 +581,23 @@ static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt
 		int plen;
 
 		bus_dev = pdev->bus->self;
+		bus_pcp = bus_dev->sysdata;
 		regs_dev = pdev;
+		regs_pcp = regs_dev->sysdata;
 
 		while (bus_dev->bus &&
-		       bus_dev->bus->number != pbm->pci_first_busno) {
+		       bus_dev->bus->number != pbm->pci_first_busno &&
+		       prom_getproplen(bus_pcp->prom_node,
+				       "interrupt-map") <= 0) {
 			regs_dev = bus_dev;
+			regs_pcp = regs_dev->sysdata;
+
 			bus_dev = bus_dev->bus->self;
+			bus_pcp = bus_dev->sysdata;
 		}
 
-		regs_pcp = regs_dev->sysdata;
 		pregs = regs_pcp->prom_regs;
 
-		bus_pcp = bus_dev->sysdata;
 
 		/* But if the PCI bridge has it's own interrupt map
 		 * and mask properties, use that and the regs of the
@@ -616,6 +621,8 @@ static int __init pci_intmap_match(struct pci_dev *pdev, unsigned int *interrupt
 				return 0;
 			}
 
+			intmask = &bridge_local_intmask;
+
 			if (pdev->bus->self != bus_dev)
 				map_slot = 1;
 		} else {