diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 12:06:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 12:06:42 +1000 |
| commit | 50f6ac54d43e4b626a33ac4577d9b4614b9601c2 (patch) | |
| tree | b07153507e62055da69b79394b532eb6d29ac896 /mm | |
| parent | 4c5a42519abb67df3bb547400957491e6e612fe6 (diff) | |
| parent | 1e8c3fdac4486ee8dbc67e89df34328be1b724b3 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
kernel/cpu.c
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/quicklist.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/quicklist.c b/mm/quicklist.c index e66d07d1b4ff..92db0f96a0cc 100644 --- a/mm/quicklist.c +++ b/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); |