diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 14:04:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 14:04:51 +1000 |
| commit | 909be4b9b1670703fc710850891f12d34db125cb (patch) | |
| tree | 4973be2c3346983cdd5e86cc37155d57d921042d /mm | |
| parent | 78e84fffb1d9293ff29b641509272e3e1ad6a837 (diff) | |
| parent | a84352f828629cfa1f48185d8b41786468d12f56 (diff) | |
Merge remote-tracking branch 'block/for-next'
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 2ddf9a990dbd..2139e30a4b44 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 " |