Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / topology.h

diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index e3f4198371a9a46e4556241d2cb95d5cad78263d..892b119dba6ff8c64c99c8c3432e812de860ef98 100644 (file)
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -176,10 +176,6 @@ static inline const struct cpumask *cpumask_of_node(int node)
 {
        return cpu_online_mask;
 }
-static inline int node_to_first_cpu(int node)
-{
-       return cpumask_first(cpu_online_mask);
-}
 
 static inline void setup_node_to_cpumask_map(void) { }
 
@@ -187,14 +183,6 @@ static inline void setup_node_to_cpumask_map(void) { }
 
 #include <asm-generic/topology.h>
 
-#ifdef CONFIG_NUMA
-/* Returns the number of the first CPU on Node 'node'. */
-static inline int node_to_first_cpu(int node)
-{
-       return cpumask_first(cpumask_of_node(node));
-}
-#endif
-
 extern const struct cpumask *cpu_coregroup_mask(int cpu);
 
 #ifdef ENABLE_TOPO_DEFINES