aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2010-03-05 16:42:43 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 14:26:31 -0500
commit72c3368856c543ace033f6a5b9a3edf1f4043236 (patch)
tree53fe8b4b19f42915a5f7d97bd1f779327dd534d4 /arch/powerpc/mm
parentd554ed895dc8f293cc712c71f14b101ace82579a (diff)
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 <hsweeten@visionengravers.com> Acked-by: David Rientjes <rientjes@google.com> Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Lee Schermerhorn <lee.schermerhorn@hp.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Dave Hansen <dave@linux.vnet.ibm.com> Cc: Milton Miller <miltonm@bga.com> Cc: Nathan Fontenot <nfont@austin.ibm.com> Cc: Geoff Levand <geoffrey.levand@am.sony.com> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: J. Bruce Fields <bfields@fieldses.org> Cc: Neil Brown <neilb@suse.de> Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: David S. Miller <davem@davemloft.net> Cc: Benny Halevy <bhalevy@panasas.com> Cc: Chuck Lever <chuck.lever@oracle.com> Cc: Ricardo Labiaga <Ricardo.Labiaga@netapp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/numa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index b037d95eeadc..64c00227b997 100644
--- 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)
451 nid = of_node_to_nid_single(cpu); 451 nid = of_node_to_nid_single(cpu);
452 452
453 if (nid < 0 || !node_online(nid)) 453 if (nid < 0 || !node_online(nid))
454 nid = any_online_node(NODE_MASK_ALL); 454 nid = first_online_node;
455out: 455out:
456 map_cpu_to_node(lcpu, nid); 456 map_cpu_to_node(lcpu, nid);
457 457
@@ -1114,7 +1114,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
1114 int nid, found = 0; 1114 int nid, found = 0;
1115 1115
1116 if (!numa_enabled || (min_common_depth < 0)) 1116 if (!numa_enabled || (min_common_depth < 0))
1117 return any_online_node(NODE_MASK_ALL); 1117 return first_online_node;
1118 1118
1119 memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); 1119 memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
1120 if (memory) { 1120 if (memory) {
@@ -1125,7 +1125,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
1125 } 1125 }
1126 1126
1127 if (nid < 0 || !node_online(nid)) 1127 if (nid < 0 || !node_online(nid))
1128 nid = any_online_node(NODE_MASK_ALL); 1128 nid = first_online_node;
1129 1129
1130 if (NODE_DATA(nid)->node_spanned_pages) 1130 if (NODE_DATA(nid)->node_spanned_pages)
1131 return nid; 1131 return nid;