X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=include%2Flinux%2Fslob_def.h;h=4382db09df4f1820ee48056ee5b8fe93dee0d3e5;hb=a6eb9fe105d5de0053b261148cee56c94b4720ca;hp=62667f72c2ef795c128b58d75a141e65beb16a35;hpb=cd1542c8197fc3c2eb3a8301505d5d9738fab1e4;p=net-next-2.6.git

diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
index 62667f72c2e..4382db09df4 100644
--- a/include/linux/slob_def.h
+++ b/include/linux/slob_def.h
@@ -1,7 +1,9 @@
 #ifndef __LINUX_SLOB_DEF_H
 #define __LINUX_SLOB_DEF_H
 
-#ifndef ARCH_KMALLOC_MINALIGN
+#ifdef ARCH_DMA_MINALIGN
+#define ARCH_KMALLOC_MINALIGN ARCH_DMA_MINALIGN
+#else
 #define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long)
 #endif