mm: move zone->pages_scanned into a vmstat counter

[firefly-linux-kernel-4.4.55.git] / mm / percpu.c

diff --git a/mm/percpu.c b/mm/percpu.c
index 2ddf9a990dbd057228782a3af5ac6901a0af632b..2139e30a4b4490da90c2e2811d5ecc901ff07d61 100644 (file)
--- 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 "