diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:54:55 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:54:55 +0100 |
| commit | 238a5b4bff2e0929a9ceb41f340137f36a6a75d9 (patch) | |
| tree | 825d444ffd70579ab3e9a84f829d0cc6091295a8 /mm/vmscan.c | |
| parent | 17d85bc7564571a1cce23ffdb2d2a33301876925 (diff) | |
| parent | 73e907de7d5cecef43d9949ab8f4fdca508168c7 (diff) | |
| download | op-kernel-dev-238a5b4bff2e0929a9ceb41f340137f36a6a75d9.zip op-kernel-dev-238a5b4bff2e0929a9ceb41f340137f36a6a75d9.tar.gz | |
Merge branch 'cpus4096' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-x86 into cpus4096
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index e895171..592bb96 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1963,7 +1963,7 @@ static int kswapd(void *p) struct reclaim_state reclaim_state = { .reclaimed_slab = 0, }; - node_to_cpumask_ptr(cpumask, pgdat->node_id); + const struct cpumask *cpumask = cpumask_of_node(pgdat->node_id); if (!cpumask_empty(cpumask)) set_cpus_allowed_ptr(tsk, cpumask); @@ -2198,7 +2198,9 @@ static int __devinit cpu_callback(struct notifier_block *nfb, if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) { for_each_node_state(nid, N_HIGH_MEMORY) { pg_data_t *pgdat = NODE_DATA(nid); - node_to_cpumask_ptr(mask, pgdat->node_id); + const struct cpumask *mask; + + mask = cpumask_of_node(pgdat->node_id); if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids) /* One of our CPUs online: restore mask */ |
