diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-14 11:32:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-14 11:32:30 +0200 |
| commit | 05cfbd66d07c44865983c8b65ae9d0037d874206 (patch) | |
| tree | 084b665cc97b47d1592fe76ea0a39a7753288a02 /mm/allocpercpu.c | |
| parent | 31c9a24ec82926fcae49483e53566d231e705057 (diff) | |
| parent | ef631b0ca01655d24e9ca7e199262c4a46416a26 (diff) | |
Merge branch 'core/urgent' into core/rcu
Merge reason: new patches to be queued up depend on:
ef631b0: rcu: Make hierarchical RCU less IPI-happy
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/allocpercpu.c')
| -rw-r--r-- | mm/allocpercpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/allocpercpu.c b/mm/allocpercpu.c index 1882923bc706..dfdee6a47359 100644 --- a/mm/allocpercpu.c +++ b/mm/allocpercpu.c @@ -31,7 +31,7 @@ static void percpu_depopulate(void *__pdata, int cpu) * @__pdata: per-cpu data to depopulate * @mask: depopulate per-cpu data for cpu's selected through mask bits */ -static void __percpu_depopulate_mask(void *__pdata, cpumask_t *mask) +static void __percpu_depopulate_mask(void *__pdata, const cpumask_t *mask) { int cpu; for_each_cpu_mask_nr(cpu, *mask) @@ -143,7 +143,7 @@ void free_percpu(void *__pdata) { if (unlikely(!__pdata)) return; - __percpu_depopulate_mask(__pdata, &cpu_possible_map); + __percpu_depopulate_mask(__pdata, cpu_possible_mask); kfree(__percpu_disguise(__pdata)); } EXPORT_SYMBOL_GPL(free_percpu); |