nodemask.h: remove macro any_online_node

The macro any_online_node() is prone to producing sparse warnings due to
the local symbol 'node'.  Since all the in-tree users are really
requesting the first online node (the mask argument is either
NODE_MASK_ALL or node_online_map) just use the first_online_node macro and
remove the any_online_node macro since there are no users.

Signed-off-by: H Hartley Sweeten <[email protected]>
Acked-by: David Rientjes <[email protected]>
Reviewed-by: KAMEZAWA Hiroyuki <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: Lee Schermerhorn <[email protected]>
Acked-by: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Milton Miller <[email protected]>
Cc: Nathan Fontenot <[email protected]>
Cc: Geoff Levand <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: J. Bruce Fields <[email protected]>
Cc: Neil Brown <[email protected]>
Cc: Trond Myklebust <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Benny Halevy <[email protected]>
Cc: Chuck Lever <[email protected]>
Cc: Ricardo Labiaga <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index b037d95eeadcc0380b34901f8113518f3bf53fa7..64c00227b99786cab5ae38d6513c73db1b13fd8f 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -451,7 +451,7 @@ static int __cpuinit numa_setup_cpu(unsigned long lcpu)
        nid = of_node_to_nid_single(cpu);
 
        if (nid < 0 || !node_online(nid))
-               nid = any_online_node(NODE_MASK_ALL);
+               nid = first_online_node;
 out:
        map_cpu_to_node(lcpu, nid);
 
@@ -1114,7 +1114,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
        int nid, found = 0;
 
        if (!numa_enabled || (min_common_depth < 0))
-               return any_online_node(NODE_MASK_ALL);
+               return first_online_node;
 
        memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
        if (memory) {
@@ -1125,7 +1125,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
        }
 
        if (nid < 0 || !node_online(nid))
-               nid = any_online_node(NODE_MASK_ALL);
+               nid = first_online_node;
 
        if (NODE_DATA(nid)->node_spanned_pages)
                return nid;

diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index 454997cccbd8c795aa0210dbd50bc0a7606e06d1..c4fa64b585ffa8469ff18a993f37a4edf1faa45a 100644 (file)
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -69,8 +69,6 @@
  * int node_online(node)               Is some node online?
  * int node_possible(node)             Is some node possible?
  *
- * int any_online_node(mask)           First online node in mask
- *
  * node_set_online(node)               set bit 'node' in node_online_map
  * node_set_offline(node)              clear bit 'node' in node_online_map
  *
@@ -467,15 +465,6 @@ static inline int num_node_state(enum node_states state)
 #define node_online_map        node_states[N_ONLINE]
 #define node_possible_map      node_states[N_POSSIBLE]
 
-#define any_online_node(mask)                  \
-({                                             \
-       int node;                               \
-       for_each_node_mask(node, (mask))        \
-               if (node_online(node))          \
-                       break;                  \
-       node;                                   \
-})
-
 #define num_online_nodes()     num_node_state(N_ONLINE)
 #define num_possible_nodes()   num_node_state(N_POSSIBLE)
 #define node_online(node)      node_state((node), N_ONLINE)

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 6dcf8c9c784c862248a770b051c3f7f956922489..8420a4205b76bc9278e247ee299d10314c68558a 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -133,7 +133,7 @@ svc_pool_map_choose_mode(void)
                return SVC_POOL_PERNODE;
        }
 
-       node = any_online_node(node_online_map);
+       node = first_online_node;
        if (nr_cpus_node(node) > 2) {
                /*
                 * Non-trivial SMP, or CONFIG_NUMA on