From 3a0d0e564bf0411e30a69d11d036376d0e54bc4d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Mon, 15 Oct 2007 20:45:32 -0700
Subject: [PATCH] --- yaml --- r: 71247 b: refs/heads/master c:
 4209ab098c61b1a9684bb4d3fc287352fc2438c3 h: refs/heads/master i:   71245:
 be0a13b4adb9221b7f9b05a8d367f64b09ff2577   71243:
 eb7fb41cbb5723bacb29b56f3e2cf4e7ace1c310   71239:
 fa3e9f3346ac01168a99ace3d8e0815f358edf24   71231:
 2c85cb69b0922256cf4507555f7d94bcae4baf01 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/sparc64/kernel/pci_common.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1f409b302847..5d223865c729 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 719023fb90009855c4515a16349fc6d0a2f93a74
+refs/heads/master: 4209ab098c61b1a9684bb4d3fc287352fc2438c3
diff --git a/trunk/arch/sparc64/kernel/pci_common.c b/trunk/arch/sparc64/kernel/pci_common.c
index c76bfbb7da08..923e0bcc3bfd 100644
--- a/trunk/arch/sparc64/kernel/pci_common.c
+++ b/trunk/arch/sparc64/kernel/pci_common.c
@@ -396,6 +396,13 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
 
 	saw_mem = saw_io = 0;
 	pbm_ranges = of_get_property(pbm->prom_node, "ranges", &i);
+	if (!pbm_ranges) {
+		prom_printf("PCI: Fatal error, missing PBM ranges property "
+			    " for %s\n",
+			    pbm->name);
+		prom_halt();
+	}
+
 	num_pbm_ranges = i / sizeof(*pbm_ranges);
 
 	for (i = 0; i < num_pbm_ranges; i++) {