diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /mm/slab.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'mm/slab.c')
-rw-r--r-- | mm/slab.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3311,7 +3311,7 @@ void *__alloc_percpu(size_t size) | |||
3311 | * and we have no way of figuring out how to fix the array | 3311 | * and we have no way of figuring out how to fix the array |
3312 | * that we have allocated then.... | 3312 | * that we have allocated then.... |
3313 | */ | 3313 | */ |
3314 | for_each_cpu(i) { | 3314 | for_each_possible_cpu(i) { |
3315 | int node = cpu_to_node(i); | 3315 | int node = cpu_to_node(i); |
3316 | 3316 | ||
3317 | if (node_online(node)) | 3317 | if (node_online(node)) |
@@ -3398,7 +3398,7 @@ void free_percpu(const void *objp) | |||
3398 | /* | 3398 | /* |
3399 | * We allocate for all cpus so we cannot use for online cpu here. | 3399 | * We allocate for all cpus so we cannot use for online cpu here. |
3400 | */ | 3400 | */ |
3401 | for_each_cpu(i) | 3401 | for_each_possible_cpu(i) |
3402 | kfree(p->ptrs[i]); | 3402 | kfree(p->ptrs[i]); |
3403 | kfree(p); | 3403 | kfree(p); |
3404 | } | 3404 | } |