[PATCH 5/11] hugetlb: accomodate reworked NODEMASK_ALLOC

[Lee Schermerhorn <lee.schermerhorn@hp.com>]

[PATCH 5/11] hugetlb:  accomodate reworked NODEMASK_ALLOC
From:	David Rientjes <rientjes@google.com>

Against:  2.6.31-mmotm-090925-1435

Depends on:  David Rientjes' "nodemask: make NODEMASK_ALLOC more general"
patch.

Fix hugetlb usage of NODEMASK_ALLOC after aforementioned patch is merged.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>

 mm/hugetlb.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.31-mmotm-090925-1435/mm/hugetlb.c
===================================================================
--- linux-2.6.31-mmotm-090925-1435.orig/mm/hugetlb.c	2009-10-05 10:45:12.000000000 -0400
+++ linux-2.6.31-mmotm-090925-1435/mm/hugetlb.c	2009-10-05 10:49:42.000000000 -0400
@@ -1347,7 +1347,7 @@ static ssize_t nr_hugepages_store_common
 	int err;
 	unsigned long count;
 	struct hstate *h = kobj_to_hstate(kobj);
-	NODEMASK_ALLOC(nodemask, nodes_allowed);
+	NODEMASK_ALLOC(nodemask_t, nodes_allowed);
 
 	err = strict_strtoul(buf, 10, &count);
 	if (err)
@@ -1638,7 +1638,7 @@ static int hugetlb_sysctl_handler_common
 	proc_doulongvec_minmax(table, write, buffer, length, ppos);
 
 	if (write) {
-		NODEMASK_ALLOC(nodemask, nodes_allowed);
+		NODEMASK_ALLOC(nodemask_t, nodes_allowed);
 		if (!(obey_mempolicy &&
 			       init_nodemask_of_mempolicy(nodes_allowed))) {
 			NODEMASK_FREE(nodes_allowed);

--
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>