ARM: 5988/1: pgprot_dmacoherent() for non-mmu builds
authorGreg Ungerer <gerg@snapgear.com>
Fri, 12 Mar 2010 05:19:25 +0000 (06:19 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 13 Mar 2010 10:48:22 +0000 (10:48 +0000)
commita91ed072d6135926c296a42b0b46de35e6347845
tree257a17cbb8f1c5e131e3425e45aa43ca6b45f60d
parentbb35579b45bcb0b74167a2165d3ea973f640bf00
ARM: 5988/1: pgprot_dmacoherent() for non-mmu builds

Commit 26a26d329688ab018e068b412b03d43d7c299f0a ("dma-mapping: switch
ARMv7 DMA mappings to retain 'memory' attribute") added a new macro,
pgprot_dmacoherent(), to correctly map DMA memory. The non-mmu pgtable
support code also needs to implement this macro, otherwise when
compiling you get:

  CC      arch/arm/mm/dma-mapping.o
arch/arm/mm/dma-mapping.c: In function 'dma_alloc_coherent':
arch/arm/mm/dma-mapping.c:320: error: implicit declaration of function 'pgprot_dmacoherent'
arch/arm/mm/dma-mapping.c:320: error: 'pgprot_kernel' undeclared (first use in this function)
arch/arm/mm/dma-mapping.c:320: error: (Each undeclared identifier is reported only once
arch/arm/mm/dma-mapping.c:320: error: for each function it appears in.)

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/include/asm/pgtable-nommu.h