Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[mirror_ubuntu-zesty-kernel.git] / mm / percpu.c

diff --git a/mm/percpu.c b/mm/percpu.c
index f696385bcc44f8597440bab9b18d9440f0de8863..0686f566d3470bb25cbe539ea19aeaec67bd4e72 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -886,7 +886,8 @@ static void __percpu *pcpu_alloc(size_t size, size_t align, bool reserved,
 
        size = ALIGN(size, 2);
 
-       if (unlikely(!size || size > PCPU_MIN_UNIT_SIZE || align > PAGE_SIZE)) {
+       if (unlikely(!size || size > PCPU_MIN_UNIT_SIZE || align > PAGE_SIZE ||
+                    !is_power_of_2(align))) {
                WARN(true, "illegal size (%zu) or align (%zu) for percpu allocation\n",
                     size, align);
                return NULL;