X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fquicklist.c;h=2876349339a7c275a940ea16c688885d13caa29d;hb=274a24c16fa97a1fc67437b191274db2286c7ac3;hp=6eedf7e473d1e89f09fcc5814e342bee01540ce4;hpb=204fba4aa303ea4a7bb726a539bf4a5b9e3203d0;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/quicklist.c b/mm/quicklist.c
index 6eedf7e..2876349 100644
--- a/mm/quicklist.c
+++ b/mm/quicklist.c
@@ -14,6 +14,7 @@
  */
 #include <linux/kernel.h>
 
+#include <linux/gfp.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/module.h>
@@ -29,7 +30,6 @@ static unsigned long max_pages(unsigned long min_pages)
 	int node = numa_node_id();
 	struct zone *zones = NODE_DATA(node)->node_zones;
 	int num_cpus_on_node;
-	const struct cpumask *cpumask_on_node = cpumask_of_node(node);
 
 	node_free_pages =
 #ifdef CONFIG_ZONE_DMA
@@ -42,7 +42,7 @@ static unsigned long max_pages(unsigned long min_pages)
 
 	max = node_free_pages / FRACTION_OF_NODE_MEM;
 
-	num_cpus_on_node = cpus_weight_nr(*cpumask_on_node);
+	num_cpus_on_node = cpumask_weight(cpumask_of_node(node));
 	max /= num_cpus_on_node;
 
 	return max(max, min_pages);