From a5e985c7fa96f5248d2a853b33f7893f3d0d9feb Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 24 Sep 2009 09:34:52 -0600 Subject: [PATCH] --- yaml --- r: 165637 b: refs/heads/master c: db7907865817137bfa3d5b4b30de9cc859b41bf1 h: refs/heads/master i: 165635: 7715db8a001299b87a4178b96b2456cca8b85252 v: v3 --- [refs] | 2 +- trunk/mm/quicklist.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2d7478557869..b1ce9a5abe97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78f1c4d6b027993763a5aba83873b0462d06db8f +refs/heads/master: db7907865817137bfa3d5b4b30de9cc859b41bf1 diff --git a/trunk/mm/quicklist.c b/trunk/mm/quicklist.c index 6eedf7e473d1..6633965bb27b 100644 --- a/trunk/mm/quicklist.c +++ b/trunk/mm/quicklist.c @@ -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; - const struct cpumask *cpumask_on_node = cpumask_of_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);