diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 08:16:22 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 08:16:22 +0100 |
| commit | 838632438145ac6863377eb12d8b8eef9c55d288 (patch) | |
| tree | fbb0757df837f3c75a99c518a3596c38daef162d /mm/quicklist.c | |
| parent | hwrng: core - Replace u32 in driver API with byte array (diff) | |
| parent | Merge branch 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linv... (diff) | |
| download | linux-838632438145ac6863377eb12d8b8eef9c55d288.tar.xz linux-838632438145ac6863377eb12d8b8eef9c55d288.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'mm/quicklist.c')
| -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 6eedf7e473d1..6633965bb27b 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); |