aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-04-02 13:53:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-03 14:16:55 +0100
commit69f4f331a0f78470f0bc42ba8db8d6cdd9cae4a9 (patch)
tree101ac757b60dfcef2de1e3ea49ee803190279c90 /arch/arm
parent[ARM] getuser.S and putuser.S don't need thread_info.h nor asm-offsets.h (diff)
downloadlinux-dev-69f4f331a0f78470f0bc42ba8db8d6cdd9cae4a9.tar.xz
linux-dev-69f4f331a0f78470f0bc42ba8db8d6cdd9cae4a9.zip
[ARM] Set coherent DMA mask for Acorn expansion cards
Although expansion cards can't do bus-master DMA, subsystems want to be able to use coherent memory for DMA purposes to these cards. Therefore, set the coherent DMA mask to allow such memory to be allocated. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/ecard.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index f1c0fb974177..6eb80acea379 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -825,6 +825,7 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
ec->dev.bus = &ecard_bus_type;
ec->dev.dma_mask = &ec->dma_mask;
ec->dma_mask = (u64)0xffffffff;
+ ec->dev.coherent_dma_mask = ec->dma_mask;
if (slot < 4) {
ec_set_resource(ec, ECARD_RES_MEMC,