diff options
| author | Jens Axboe <axboe@fb.com> | 2014-07-01 16:19:04 (GMT) |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-07-01 16:19:04 (GMT) |
| commit | 17737d3b5997ac9f810967f0c6014d124ec39490 (patch) | |
| tree | 5ee591a925382668d669fe5db3c3d1067f7340e8 /mm | |
| parent | 4c834452aad01531db949414f94f817a86348d59 (diff) | |
| parent | 2d7227828e1475c7b272e55bd70c4cec8eea219a (diff) | |
| download | linux-17737d3b5997ac9f810967f0c6014d124ec39490.tar.xz | |
Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.17/core
Merge the percpu_ref changes from Tejun, he says they are stable now.
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/percpu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 2ddf9a9..2139e30 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -720,8 +720,7 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved) if (unlikely(align < 2)) align = 2; - if (unlikely(size & 1)) - size++; + size = ALIGN(size, 2); if (unlikely(!size || size > PCPU_MIN_UNIT_SIZE || align > PAGE_SIZE)) { WARN(true, "illegal size (%zu) or align (%zu) for " |