From 36297bc9dee30076e8ffd0b74b84078607dc8b7f Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Fri, 13 Oct 2006 12:26:57 +1000
Subject: [PATCH] --- yaml --- r: 39767 b: refs/heads/master c:
 284a940675a64df253e3dffc60b09bb4bbb149e4 h: refs/heads/master i:   39765:
 857eee63bc42211ae36edcd92a34bad414098fc6   39763:
 ac7433cd87d70dbb33f53465376cd9e5f198a8ca   39759:
 56b471c3d8a0f6d6a3a460e9551de85747f8f71b v: v3

---
 [refs]                             |  2 +-
 trunk/arch/powerpc/kernel/pci_64.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7eea716a2a85..0ca03cf8a725 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00ae36de49cc718d4122e1c8aac96fd1a5a2553c
+refs/heads/master: 284a940675a64df253e3dffc60b09bb4bbb149e4
diff --git a/trunk/arch/powerpc/kernel/pci_64.c b/trunk/arch/powerpc/kernel/pci_64.c
index 78d3c0fc8dfb..9bae8a5bf671 100644
--- a/trunk/arch/powerpc/kernel/pci_64.c
+++ b/trunk/arch/powerpc/kernel/pci_64.c
@@ -199,8 +199,14 @@ struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
 	pci_setup_pci_controller(phb);
 	phb->arch_data = dev;
 	phb->is_dynamic = mem_init_done;
-	if (dev)
-		PHB_SET_NODE(phb, of_node_to_nid(dev));
+	if (dev) {
+		int nid = of_node_to_nid(dev);
+
+		if (nid < 0 || !node_online(nid))
+			nid = -1;
+
+		PHB_SET_NODE(phb, nid);
+	}
 	return phb;
 }