X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fquicklist.c;h=6633965bb27bcb609be4578dcb8bcd30cd3e39c8;hb=08677214e318297f228237be0042aac754f48f1d;hp=8dbb6805ef35a91af20a8aeb7090090e044d86e9;hpb=b954185214c3b562c3fcc651e9ec69d421d76bfa;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/quicklist.c b/mm/quicklist.c
index 8dbb680..6633965 100644
--- a/mm/quicklist.c
+++ b/mm/quicklist.c
@@ -19,7 +19,7 @@
 #include <linux/module.h>
 #include <linux/quicklist.h>
 
-DEFINE_PER_CPU(struct quicklist, quicklist)[CONFIG_NR_QUICK];
+DEFINE_PER_CPU(struct quicklist [CONFIG_NR_QUICK], quicklist);
 
 #define FRACTION_OF_NODE_MEM	16
 
@@ -29,7 +29,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;
-	node_to_cpumask_ptr(cpumask_on_node, node);
 
 	node_free_pages =
 #ifdef CONFIG_ZONE_DMA
@@ -42,7 +41,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);