diff --git a/[refs] b/[refs]
index e1b24ac71305..c9946b0bcf01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81819f0fc8285a2a5a921c019e3e3d7b6169d225
+refs/heads/master: 47bfdc0d5a18a4b760ffb6a332932aaa5c0859e0
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 0cd56bd74b64..4a8585befd84 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -145,11 +145,11 @@
 		SLAB_CACHE_DMA)
 
 #ifndef ARCH_KMALLOC_MINALIGN
-#define ARCH_KMALLOC_MINALIGN sizeof(void *)
+#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long)
 #endif
 
 #ifndef ARCH_SLAB_MINALIGN
-#define ARCH_SLAB_MINALIGN sizeof(void *)
+#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
 #endif
 
 /* Internal SLUB flags */