Skip to content

Commit

Permalink
nodemask.h: remove macro any_online_node
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
H Hartley Sweeten authored and torvalds committed Mar 6, 2010
1 parent d554ed8 commit 72c3368
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
6 changes: 3 additions & 3 deletions arch/powerpc/mm/numa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down
11 changes: 0 additions & 11 deletions include/linux/nodemask.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion net/sunrpc/svc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 72c3368

Please sign in to comment.