From: Greg KH on
2.6.32-stable review patch. If anyone has any objections, please let us know.

------------------

From: FUJITA Tomonori <fujita.tomonori(a)lab.ntt.co.jp>

commit dd6c26a66bdc629a500174ffe73b010b070b9f1b upstream.

Architectures that handle DMA-non-coherent memory need to set
ARCH_KMALLOC_MINALIGN to make sure that kmalloc'ed buffer is DMA-safe: the
buffer doesn't share a cache with the others.

Signed-off-by: FUJITA Tomonori <fujita.tomonori(a)lab.ntt.co.jp>
Cc: Geert Uytterhoeven <geert(a)linux-m68k.org>
Cc: Roman Zippel <zippel(a)linux-m68k.org>
Acked-by: Pekka Enberg <penberg(a)cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
arch/m68k/include/asm/cache.h | 2 ++
1 file changed, 2 insertions(+)

--- a/arch/m68k/include/asm/cache.h
+++ b/arch/m68k/include/asm/cache.h
@@ -8,4 +8,6 @@
#define L1_CACHE_SHIFT 4
#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)

+#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES
+
#endif


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/