From 304089639c9b2c336ea87ba6656faba58be511cf Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Sun, 6 May 2007 14:49:37 -0700
Subject: [PATCH] --- yaml --- r: 54199 b: refs/heads/master c:
 47bfdc0d5a18a4b760ffb6a332932aaa5c0859e0 h: refs/heads/master i:   54197:
 ec4d00fa1d18408a7c9ee77eabe70de8527d5209   54195:
 7e38b155a7b5b15f35c66d75186d6de5e5729842   54191:
 d4ea03e670bd2890b71bd34044486cca1eaaa683 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 */