diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 14:50:03 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 21:20:20 +0100 |
| commit | 80c5520811d3805adcb15c570ea5e2d489fa5d0b (patch) | |
| tree | ae797a7f4af39f80e77526533d06ac23b439f0ab /mm/quicklist.c | |
| parent | Merge branches 'irq/sparseirq' and 'linus' into irq/core (diff) | |
| parent | cpumask: remove cpumask allocation from idle_balance, fix (diff) | |
| download | linux-dev-80c5520811d3805adcb15c570ea5e2d489fa5d0b.tar.xz linux-dev-80c5520811d3805adcb15c570ea5e2d489fa5d0b.zip | |
Merge branch 'cpus4096' into irq/threaded
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'mm/quicklist.c')
| -rw-r--r-- | mm/quicklist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/quicklist.c b/mm/quicklist.c index 8dbb6805ef35..e66d07d1b4ff 100644 --- a/mm/quicklist.c +++ b/mm/quicklist.c @@ -29,7 +29,7 @@ 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); + const struct cpumask *cpumask_on_node = cpumask_of_node(node); node_free_pages = #ifdef CONFIG_ZONE_DMA |