X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Flinux%2Fslab_def.h;h=791a502f69063a2255c3e41d6c47e865e0c1f610;hb=946880fa270c18c137654af70ba939f03181c6b6;hp=1acfa73ce2ac4597559c729301c2c6479ea49c7e;hpb=0fc2f137226eff4c9dd90864dda5c237474c3ec5;p=mv-sheeva.git

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 1acfa73ce2a..791a502f690 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -17,7 +17,6 @@
 
 #include <trace/events/kmem.h>
 
-#ifndef ARCH_KMALLOC_MINALIGN
 /*
  * Enforce a minimum alignment for the kmalloc caches.
  * Usually, the kmalloc caches are cache_line_size() aligned, except when
@@ -27,6 +26,9 @@
  * ARCH_KMALLOC_MINALIGN allows that.
  * Note that increasing this value may disable some debug features.
  */
+#ifdef ARCH_DMA_MINALIGN
+#define ARCH_KMALLOC_MINALIGN ARCH_DMA_MINALIGN
+#else
 #define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long long)
 #endif