Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

[mv-sheeva.git] / include / asm-generic / topology.h

diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h
index 88bada2ebc4b1fb1bb980f96daa8409ac5933eb2..510df36dd5d44f8b40e0ed048bbb7c8fa1ef506f 100644 (file)
--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
@@ -37,9 +37,6 @@
 #ifndef parent_node
 #define parent_node(node)      ((void)(node),0)
 #endif
-#ifndef node_to_cpumask
-#define node_to_cpumask(node)  ((void)node, cpu_online_map)
-#endif
 #ifndef cpumask_of_node
 #define cpumask_of_node(node)  ((void)node, cpu_online_mask)
 #endif
@@ -55,18 +52,4 @@
 
 #endif /* CONFIG_NUMA */
 
-/*
- * returns pointer to cpumask for specified node
- * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"
- */
-#ifndef node_to_cpumask_ptr
-
-#define        node_to_cpumask_ptr(v, node)                                    \
-               cpumask_t _##v = node_to_cpumask(node);                 \
-               const cpumask_t *v = &_##v
-
-#define node_to_cpumask_ptr_next(v, node)                              \
-                         _##v = node_to_cpumask(node)
-#endif
-
 #endif /* _ASM_GENERIC_TOPOLOGY_H */