diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 00:54:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 00:54:55 -0400 |
| commit | 238a5b4bff2e0929a9ceb41f340137f36a6a75d9 (patch) | |
| tree | 825d444ffd70579ab3e9a84f829d0cc6091295a8 /mm/quicklist.c | |
| parent | 17d85bc7564571a1cce23ffdb2d2a33301876925 (diff) | |
| parent | 73e907de7d5cecef43d9949ab8f4fdca508168c7 (diff) | |
Merge branch 'cpus4096' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-x86 into cpus4096
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) | |||
| 29 | int node = numa_node_id(); | 29 | int node = numa_node_id(); |
| 30 | struct zone *zones = NODE_DATA(node)->node_zones; | 30 | struct zone *zones = NODE_DATA(node)->node_zones; |
| 31 | int num_cpus_on_node; | 31 | int num_cpus_on_node; |
| 32 | node_to_cpumask_ptr(cpumask_on_node, node); | 32 | const struct cpumask *cpumask_on_node = cpumask_of_node(node); |
| 33 | 33 | ||
| 34 | node_free_pages = | 34 | node_free_pages = |
| 35 | #ifdef CONFIG_ZONE_DMA | 35 | #ifdef CONFIG_ZONE_DMA |