---

yaml --- r: 140539 b: refs/heads/master c: cb3d560 h: refs/heads/master i: 140537: 77194e0 140535: ef9e95a v: v3
git-mirror · Mar 13, 2009 · c49d1a4 · c49d1a4
1 parent b8c9bbb
commit c49d1a4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 101aaca1f32d9923331ddc63a7a72b3a7f934c02
+refs/heads/master: cb3d560f36c1e4aa3c26a1d79e9b6e62ab69896c
diff --git a/trunk/arch/x86/include/asm/pci.h b/trunk/arch/x86/include/asm/pci.h
@@ -109,11 +109,6 @@ static inline int __pcibus_to_node(const struct pci_bus *bus)
 	return sd->node;
 }
 
-static inline cpumask_t __pcibus_to_cpumask(struct pci_bus *bus)
-{
-	return node_to_cpumask(__pcibus_to_node(bus));
-}
-
 static inline const struct cpumask *
 cpumask_of_pcibus(const struct pci_bus *bus)
 {

diff --git a/trunk/arch/x86/include/asm/topology.h b/trunk/arch/x86/include/asm/topology.h
@@ -143,7 +143,6 @@ extern void setup_node_to_cpumask_map(void);
 #define parent_node(node) (node)
 
 #define pcibus_to_node(bus) __pcibus_to_node(bus)
-#define pcibus_to_cpumask(bus) __pcibus_to_cpumask(bus)
 
 #ifdef CONFIG_X86_32
 extern unsigned long node_start_pfn[];