From a58d2b306fe789cac831021049243fade040fc63 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 5 Mar 2010 13:42:43 -0800
Subject: [PATCH] --- yaml --- r: 186239 b: refs/heads/master c:
 72c3368856c543ace033f6a5b9a3edf1f4043236 h: refs/heads/master i:   186237:
 72ab2427ec0d86bc056edde8c2b8b69ee3abba57   186235:
 622985ef4ba0ef7a7e9c1b12cc8528c3c9c23897   186231:
 fe79d68fd4a1b2a02224fee5263577765b9aaf6b   186223:
 6834054f4413923512432703c3bd2c480076ad0f   186207:
 efec01c402fc6af13deabe4df1196834b44ee60b   186175:
 237ac15c610baede9e7d01aa97aa8921efe9e281   186111:
 d2f318f98fe85051d6b203777195fdae878964b5 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/powerpc/mm/numa.c   |  6 +++---
 trunk/include/linux/nodemask.h | 11 -----------
 trunk/net/sunrpc/svc.c         |  2 +-
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index d48b6389d3b2..0412b430b9ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d554ed895dc8f293cc712c71f14b101ace82579a
+refs/heads/master: 72c3368856c543ace033f6a5b9a3edf1f4043236
diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c
index b037d95eeadc..64c00227b997 100644
--- a/trunk/arch/powerpc/mm/numa.c
+++ b/trunk/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/trunk/include/linux/nodemask.h b/trunk/include/linux/nodemask.h
index 454997cccbd8..c4fa64b585ff 100644
--- a/trunk/include/linux/nodemask.h
+++ b/trunk/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/trunk/net/sunrpc/svc.c b/trunk/net/sunrpc/svc.c
index 6dcf8c9c784c..8420a4205b76 100644
--- a/trunk/net/sunrpc/svc.c
+++ b/trunk/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