Sync with sys/i386/isa/isa.c and wd.c revisions 1.115 and 1.177,
respectively.
This commit is contained in:
parent
d127589f63
commit
6df6b29b85
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
|
||||
* $Id: pc98.c,v 1.51 1998/07/19 15:04:26 kato Exp $
|
||||
* $Id: pc98.c,v 1.52 1998/10/12 15:06:02 kato Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -960,7 +960,7 @@ isa_dmarangecheck(caddr_t va, u_int length, int chan)
|
||||
vm_offset_t phys, priorpage = 0, endva;
|
||||
u_int dma_pgmsk = (chan & 4) ? ~(128*1024-1) : ~(64*1024-1);
|
||||
|
||||
endva = (vm_offset_t)round_page(va + length);
|
||||
endva = (vm_offset_t)round_page((vm_offset_t)va + length);
|
||||
for (; va < (caddr_t) endva ; va += PAGE_SIZE) {
|
||||
phys = trunc_page(pmap_extract(pmap_kernel(), (vm_offset_t)va));
|
||||
#ifdef EPSON_BOUNCEDMA
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
|
||||
* $Id: wd.c,v 1.62 1998/09/14 19:56:40 sos Exp $
|
||||
* $Id: wd.c,v 1.63 1998/09/15 14:07:08 kato Exp $
|
||||
*/
|
||||
|
||||
/* TODO:
|
||||
@ -2407,7 +2407,7 @@ wddump(dev_t dev)
|
||||
while (blkcnt != 0) {
|
||||
if (is_physical_memory((vm_offset_t)addr))
|
||||
pmap_enter(kernel_pmap, (vm_offset_t)CADDR1,
|
||||
trunc_page(addr), VM_PROT_READ, TRUE);
|
||||
trunc_page((vm_offset_t)addr), VM_PROT_READ, TRUE);
|
||||
else
|
||||
pmap_enter(kernel_pmap, (vm_offset_t)CADDR1,
|
||||
trunc_page(0), VM_PROT_READ, TRUE);
|
||||
|
Loading…
Reference in New Issue
Block a user