diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-03 17:21:47 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2009-11-03 17:21:47 +0000 |
| commit | d12bea54c90389fd6b2719cee4a79a39be514337 (patch) | |
| tree | b8be4f7d2fe9e20f9e90564c9880c3e5be40b004 /sys/arch/i386 | |
| parent | 62955076325b9c14c23349c868f41c5d1bedd977 (diff) | |
fix previous commit.
do not ignore BUS_DMA_NOCACHE (used by some variants of auich and
ati drm only).
ok kettenis
"That looks right" deraadt
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/bus_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/bus_dma.c b/sys/arch/i386/i386/bus_dma.c index f3cd5e4b6c6..0a9c664b02e 100644 --- a/sys/arch/i386/i386/bus_dma.c +++ b/sys/arch/i386/i386/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.18 2009/08/11 17:15:54 oga Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.19 2009/11/03 17:21:46 damien Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. * All rights reserved. @@ -436,7 +436,7 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs, addr += PAGE_SIZE, va += PAGE_SIZE, size -= PAGE_SIZE) { if (size == 0) panic("_bus_dmamem_map: size botch"); - pmap_enter(pmap_kernel(), va, addr, + pmap_enter(pmap_kernel(), va, addr | pmapflags, VM_PROT_READ | VM_PROT_WRITE, VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED); } |