diff --git a/[refs] b/[refs] index b4e8d5e79bfc..fd17a9934f4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2b0261506602bd969164879206027b30358ffdf +refs/heads/master: e317603694bfd17b28a40de9d65e1a4ec12f816e diff --git a/trunk/include/linux/percpu.h b/trunk/include/linux/percpu.h index d8e5a9abbce0..545b068bcb70 100644 --- a/trunk/include/linux/percpu.h +++ b/trunk/include/linux/percpu.h @@ -156,7 +156,7 @@ static inline void *__alloc_percpu(size_t size, size_t align) * on it. Larger alignment should only be used for module * percpu sections on SMP for which this path isn't used. */ - WARN_ON_ONCE(align > __alignof__(unsigned long long)); + WARN_ON_ONCE(align > SMP_CACHE_BYTES); return kzalloc(size, GFP_KERNEL); }