FRV: ARCH_KMALLOC_MINALIGN was already defined
authorDavid Howells <dhowells@redhat.com>
Fri, 28 May 2010 09:41:16 +0000 (10:41 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 May 2010 17:17:21 +0000 (10:17 -0700)
commit8507bb0062bff1431bbcce921efe5cd1186fcff2
tree439c0436112ac225e7b2dbd020fc2083c4b45044
parent29d03fa12bc02c0f8085cd6bb06d11359a4bccaf
FRV: ARCH_KMALLOC_MINALIGN was already defined

ARCH_KMALLOC_MINALIGN was already defined in asm/mem-layout.h and so shouldn't
have been added to asm/cache.h as well, but rather altered in place.

The commit that added it to asm/cache.h was:

commit 69dcf3db03626c4f18de624e8632454ea12ff260
Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date:   Mon May 24 14:32:54 2010 -0700

    frv: set ARCH_KMALLOC_MINALIGN

    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: David Howells <dhowells@redhat.com>
cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/frv/include/asm/cache.h
arch/frv/include/asm/mem-layout.h