From 4c02b371de331fecd43208d8e1d2bb744e0bf6cd Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Fri, 18 Sep 2009 03:41:10 -0700
Subject: [PATCH] --- yaml --- r: 165978 b: refs/heads/master c:
 7715a1e887c5dedc9cf1e57a8f35df261c749b08 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/include/asm/pci.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0bf54f3f8aa..5ca5f504f1ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be3652b8a253346339ce32501dd48fb033258936
+refs/heads/master: 7715a1e887c5dedc9cf1e57a8f35df261c749b08
diff --git a/trunk/arch/x86/include/asm/pci.h b/trunk/arch/x86/include/asm/pci.h
index f76a162c082c..ada8c201d513 100644
--- a/trunk/arch/x86/include/asm/pci.h
+++ b/trunk/arch/x86/include/asm/pci.h
@@ -143,7 +143,11 @@ static inline int __pcibus_to_node(const struct pci_bus *bus)
 static inline const struct cpumask *
 cpumask_of_pcibus(const struct pci_bus *bus)
 {
-	return cpumask_of_node(__pcibus_to_node(bus));
+	int node;
+
+	node = __pcibus_to_node(bus);
+	return (node == -1) ? cpu_online_mask :
+			      cpumask_of_node(node);
 }
 #endif