summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2010-05-19 12:02:14 +0100
committerPekka Enberg <penberg@cs.helsinki.fi>2010-05-19 22:03:13 +0300
commit4581ced379736fd76432c754f999d26deb83fbb7 (patch)
treeb3c29e714fffb4e7e14b9affe458de316bb4eacd /mm
parentbac49ce42a33f53beb7cf04e9a0600879d6265ca (diff)
downloadlinux-4581ced379736fd76432c754f999d26deb83fbb7.tar.gz
linux-4581ced379736fd76432c754f999d26deb83fbb7.tar.bz2
linux-4581ced379736fd76432c754f999d26deb83fbb7.zip
mm: Move ARCH_SLAB_MINALIGN and ARCH_KMALLOC_MINALIGN to <linux/slub_def.h>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/mm/slub.c b/mm/slub.c
index d2a54fe71ea2..c874c3efac29 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -157,14 +157,6 @@
#define SLUB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \
SLAB_CACHE_DMA | SLAB_NOTRACK)
-#ifndef ARCH_KMALLOC_MINALIGN
-#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long)
-#endif
-
-#ifndef ARCH_SLAB_MINALIGN
-#define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
-#endif
-
#define OO_SHIFT 16
#define OO_MASK ((1 << OO_SHIFT) - 1)
#define MAX_OBJS_PER_PAGE 65535 /* since page.objects is u16 */