From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail190.messagelabs.com (mail190.messagelabs.com [216.82.249.51]) by kanga.kvack.org (Postfix) with ESMTP id 0B0526B005A for ; Thu, 8 Oct 2009 12:21:16 -0400 (EDT) From: Lee Schermerhorn Date: Thu, 08 Oct 2009 12:25:21 -0400 Message-Id: <20091008162521.23192.32391.sendpatchset@localhost.localdomain> In-Reply-To: <20091008162454.23192.91832.sendpatchset@localhost.localdomain> References: <20091008162454.23192.91832.sendpatchset@localhost.localdomain> Subject: [PATCH 4/12] hugetlb: factor init_nodemask_of_node Sender: owner-linux-mm@kvack.org To: linux-mm@kvack.org, linux-numa@vger.kernel.org Cc: akpm@linux-foundation.org, Mel Gorman , Randy Dunlap , Nishanth Aravamudan , andi@firstfloor.org, David Rientjes , Adam Litke , Andy Whitcroft , eric.whitney@hp.com List-ID: [PATCH 4/12] hugetlb: factor init_nodemask_of_node() Factor init_nodemask_of_node() out of the nodemask_of_node() macro. This will be used to populate the huge pages "nodes_allowed" nodemask for a single node when basing nodes_allowed on a preferred/local mempolicy or when a persistent huge page pool page count is modified via a per node sysfs attribute. Signed-off-by: Lee Schermerhorn Acked-by: Mel Gorman Reviewed-by: Andi Kleen --- Against: 2.6.31-mmotm-090925-1435 New in V5 of series V6: + rename 'init_nodemask_of_nodes()' to 'init_nodemask_of_node()' + redefine init_nodemask_of_node() as static inline fcn + move this patch back 1 in series V8: + factor 'init_nodemask_of_node()' from nodemask_of_node() + drop alloc_nodemask_of_node() -- not used any more V9: + remove extra parens around arguments now that init_nodemask_of_node is not longer a macro. V10: REALLY remove the extra parentheses. Duh! include/linux/nodemask.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) Index: linux-2.6.31-mmotm-090925-1435/include/linux/nodemask.h =================================================================== --- linux-2.6.31-mmotm-090925-1435.orig/include/linux/nodemask.h 2009-10-07 12:31:53.000000000 -0400 +++ linux-2.6.31-mmotm-090925-1435/include/linux/nodemask.h 2009-10-07 12:31:58.000000000 -0400 @@ -245,14 +245,19 @@ static inline int __next_node(int n, con return min_t(int,MAX_NUMNODES,find_next_bit(srcp->bits, MAX_NUMNODES, n+1)); } +static inline void init_nodemask_of_node(nodemask_t *mask, int node) +{ + nodes_clear(*mask); + node_set(node, *mask); +} + #define nodemask_of_node(node) \ ({ \ typeof(_unused_nodemask_arg_) m; \ if (sizeof(m) == sizeof(unsigned long)) { \ - m.bits[0] = 1UL<<(node); \ + m.bits[0] = 1UL << (node); \ } else { \ - nodes_clear(m); \ - node_set((node), m); \ + init_nodemask_of_node(&m, (node)); \ } \ m; \ }) -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org