diff --git a/[refs] b/[refs]
index 02b8495921fa..7d1024edd643 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66c3a75772247c31feabefb724e082220a1ab060
+refs/heads/master: 60db56422043aaa455ac7f858ce23c273220f9d9
diff --git a/trunk/mm/allocpercpu.c b/trunk/mm/allocpercpu.c
index 3653c570232b..1882923bc706 100644
--- a/trunk/mm/allocpercpu.c
+++ b/trunk/mm/allocpercpu.c
@@ -120,7 +120,7 @@ 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);
 
 	if (unlikely(!pdata))
 		return NULL;