From c49d1a43fcb9c59840cbed6a1cef7925f7d310ad Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 13 Mar 2009 14:49:47 +1030
Subject: [PATCH] --- yaml --- r: 140539 b: refs/heads/master c:
 cb3d560f36c1e4aa3c26a1d79e9b6e62ab69896c h: refs/heads/master i:   140537:
 77194e0e3f9c4f0332df85ecd7cf7953500828e8   140535:
 ef9e95aca0ca60eace6cdc39b6a474d8130b0af1 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/include/asm/pci.h      | 5 -----
 trunk/arch/x86/include/asm/topology.h | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1e116d1ce25f..7cc0ab599f2c 100644
--- 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
index a977de23cb4d..93c8dc318111 100644
--- 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
index 77cfb2cfb386..d772facb263e 100644
--- 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[];