diff options
| author | Linus Torvalds | 2013-11-13 15:17:16 +0900 |
|---|---|---|
| committer | Linus Torvalds | 2013-11-13 15:17:16 +0900 |
| commit | c08acff0544c5dadf892e3908799a5ca1d98e592 (patch) | |
| tree | 52fbb693a523ef7c6eeb33dd58c6a95f6feb1ea5 /mm | |
| parent | 10d0c9705e80bbd3d587c5fad24599aabaca6688 (diff) | |
| parent | 90f2492cf9c84fd414ecfd2f40685fb5291a484e (diff) | |
Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu changes from Tejun Heo:
"Two smallish changes for percpu. Two patches to remove unused
this_cpu_xor() and one to fix a bug in percpu init failure path so
that it can reach the proper BUG() instead of oopsing earlier"
* 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
x86: remove this_cpu_xor() implementation
percpu: remove this_cpu_xor() implementation
percpu: fix bootmem error handling in pcpu_page_first_chunk()
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/percpu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 8c8e08f3a692..0d10defe951e 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1706,8 +1706,9 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, out_free_areas: for (group = 0; group < ai->nr_groups; group++) - free_fn(areas[group], - ai->groups[group].nr_units * ai->unit_size); + if (areas[group]) + free_fn(areas[group], + ai->groups[group].nr_units * ai->unit_size); out_free: pcpu_free_alloc_info(ai); if (areas) |