From patchwork Wed Jan 6 23:24:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartley Sweeten X-Patchwork-Id: 42376 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id C542EB7F25 for ; Thu, 7 Jan 2010 10:41:54 +1100 (EST) Received: by ozlabs.org (Postfix) id 33380B7BFB; Thu, 7 Jan 2010 10:41:47 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org X-Greylist: delayed 1027 seconds by postgrey-1.32 at bilbo; Thu, 07 Jan 2010 10:41:45 EST Received: from visionfs1.visionengravers.com (unknown [206.15.93.42]) by ozlabs.org (Postfix) with ESMTP id 00A03B6EF3 for ; Thu, 7 Jan 2010 10:41:44 +1100 (EST) From: H Hartley Sweeten To: Linux Kernel , linuxppc-dev@ozlabs.org, devicetree-discuss@lists.ozlabs.org, linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] nodmask.h: remove macro any_online_node Date: Wed, 6 Jan 2010 16:24:58 -0700 MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201001061624.59118.hartleys@visionengravers.com> Cc: lee.schermerhorn@hp.com, bfields@fieldses.org, mel@csn.ul.ie, Trond.Myklebust@netapp.com, miltonm@bga.com, dave@linux.vnet.ibm.com, neilb@suse.de, chuck.lever@oracle.com, paulus@samba.org, Ricardo.Labiaga@netapp.com, rientjes@google.com, bhalevy@panasas.com, akpm@linux-foundation.org, davem@davemloft.net, kamezawa.hiroyu@jp.fujitsu.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org nodmask.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 Cc: Andrew Morton Cc: David Rientjes Cc: KAMEZAWA Hiroyuki Cc: Mel Gorman Cc: Lee Schermerhorn Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Dave Hansen Cc: Milton Miller Cc: Nathan Fontenot Cc: Geoff Levand Cc: Grant Likely Cc: J. Bruce Fields Cc: Neil Brown Cc: Trond Myklebust Cc: David S. Miller Cc: Benny Halevy Cc: Chuck Lever Cc: Ricardo Labiaga Reviewed-by: KAMEZAWA Hiroyuki Acked-by: David Rientjes Acked-by: Benjamin Herrenschmidt diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index b037d95..64c0022 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) 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 454997c..c4fa64b 100644 --- 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 538ca43..832c1fe 100644 --- 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