Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/UBC_WINSIZE/ubc_winsize/g except the variable initialization.

This commit is contained in:
enami 2000-12-21 03:37:59 +00:00
parent bd50a7eb6a
commit 4e59adc1bb
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sys/uvm/uvm_bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_bio.c,v 1.3 2000/12/10 19:28:09 chs Exp $ */
/* $NetBSD: uvm_bio.c,v 1.4 2000/12/21 03:37:59 enami Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@ -66,7 +66,7 @@ static struct ubc_map *ubc_find_mapping __P((struct uvm_object *, voff_t));
(((u_long)(offset)) >> PAGE_SHIFT)) & \
ubc_object.hashmask)
#define UBC_QUEUE(offset) (&ubc_object.inactive[((offset) / UBC_WINSIZE) & \
#define UBC_QUEUE(offset) (&ubc_object.inactive[((offset) / ubc_winsize) & \
(UBC_NQUEUES - 1)])
struct ubc_map
@ -150,10 +150,10 @@ ubc_init(void)
va = (vaddr_t)1L;
#ifdef PMAP_PREFER
PMAP_PREFER(0, &va);
if (va < UBC_WINSIZE) {
va = UBC_WINSIZE;
if (va < ubc_winsize) {
va = ubc_winsize;
}
ubc_nqueues = va / UBC_WINSIZE;
ubc_nqueues = va / ubc_winsize;
if (ubc_nqueues != 1) {
ubc_release_unmap = TRUE;
}
@ -177,7 +177,7 @@ ubc_init(void)
}
if (uvm_map(kernel_map, (vaddr_t *)&ubc_object.kva,
ubc_nwins * UBC_WINSIZE, &ubc_object.uobj, 0, (vsize_t)va,
ubc_nwins * ubc_winsize, &ubc_object.uobj, 0, (vsize_t)va,
UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, UVM_INH_NONE,
UVM_ADV_RANDOM, UVM_FLAG_NOMERGE))
!= KERN_SUCCESS) {
@ -205,7 +205,7 @@ ubc_fault(ufi, ign1, ign2, ign3, ign4, fault_type, access_type, flags)
struct ubc_map *umap;
vaddr_t va, eva, ubc_offset, slot_offset;
int i, rv, npages;
struct vm_page *pgs[UBC_WINSIZE >> PAGE_SHIFT], *pg;
struct vm_page *pgs[ubc_winsize >> PAGE_SHIFT], *pg;
UVMHIST_FUNC("ubc_fault"); UVMHIST_CALLED(ubchist);
/*
@ -228,16 +228,16 @@ ubc_fault(ufi, ign1, ign2, ign3, ign4, fault_type, access_type, flags)
UVMHIST_LOG(ubchist, "va 0x%lx ubc_offset 0x%lx at %d",
va, ubc_offset, access_type,0);
umap = &ubc_object.umap[ubc_offset / UBC_WINSIZE];
umap = &ubc_object.umap[ubc_offset / ubc_winsize];
KASSERT(umap->refcount != 0);
slot_offset = trunc_page(ubc_offset & (UBC_WINSIZE - 1));
slot_offset = trunc_page(ubc_offset & (ubc_winsize - 1));
/* no umap locking needed since we have a ref on the umap */
uobj = umap->uobj;
vp = (struct vnode *)uobj;
KASSERT(uobj != NULL);
npages = (UBC_WINSIZE - slot_offset) >> PAGE_SHIFT;
npages = (ubc_winsize - slot_offset) >> PAGE_SHIFT;
/*
* XXXUBC
@ -376,9 +376,9 @@ ubc_alloc(uobj, offset, lenp, flags)
UVMHIST_LOG(ubchist, "uobj %p offset 0x%lx len 0x%lx filesize 0x%x",
uobj, offset, *lenp, ((struct uvm_vnode *)uobj)->u_size);
umap_offset = (vaddr_t)(offset & ~((voff_t)UBC_WINSIZE - 1));
slot_offset = (vaddr_t)(offset & ((voff_t)UBC_WINSIZE - 1));
*lenp = min(*lenp, UBC_WINSIZE - slot_offset);
umap_offset = (vaddr_t)(offset & ~((voff_t)ubc_winsize - 1));
slot_offset = (vaddr_t)(offset & ((voff_t)ubc_winsize - 1));
*lenp = min(*lenp, ubc_winsize - slot_offset);
/*
* the vnode is always locked here, so we don't need to add a ref.
@ -413,8 +413,8 @@ again:
umap, hash);
va = (vaddr_t)(ubc_object.kva +
(umap - ubc_object.umap) * UBC_WINSIZE);
pmap_remove(pmap_kernel(), va, va + UBC_WINSIZE);
(umap - ubc_object.umap) * ubc_winsize);
pmap_remove(pmap_kernel(), va, va + ubc_winsize);
}
if (umap->refcount == 0) {
@ -437,10 +437,10 @@ again:
splx(s);
UVMHIST_LOG(ubchist, "umap %p refs %d va %p",
umap, umap->refcount,
ubc_object.kva + (umap - ubc_object.umap) * UBC_WINSIZE,0);
ubc_object.kva + (umap - ubc_object.umap) * ubc_winsize,0);
return ubc_object.kva +
(umap - ubc_object.umap) * UBC_WINSIZE + slot_offset;
(umap - ubc_object.umap) * ubc_winsize + slot_offset;
}
@ -459,7 +459,7 @@ ubc_release(va, wlen)
s = splbio();
simple_lock(&ubc_object.uobj.vmobjlock);
umap = &ubc_object.umap[((char *)va - ubc_object.kva) / UBC_WINSIZE];
umap = &ubc_object.umap[((char *)va - ubc_object.kva) / ubc_winsize];
uobj = umap->uobj;
KASSERT(uobj != NULL);
@ -483,8 +483,8 @@ ubc_release(va, wlen)
*/
va = (vaddr_t)(ubc_object.kva +
(umap - ubc_object.umap) * UBC_WINSIZE);
pmap_remove(pmap_kernel(), va, va + UBC_WINSIZE);
(umap - ubc_object.umap) * ubc_winsize);
pmap_remove(pmap_kernel(), va, va + ubc_winsize);
LIST_REMOVE(umap, hash);
umap->uobj = NULL;
TAILQ_INSERT_HEAD(UBC_QUEUE(umap->offset), umap,
@ -536,8 +536,8 @@ ubc_flush(uobj, start, end)
*/
va = (vaddr_t)(ubc_object.kva +
(umap - ubc_object.umap) * UBC_WINSIZE);
pmap_remove(pmap_kernel(), va, va + UBC_WINSIZE);
(umap - ubc_object.umap) * ubc_winsize);
pmap_remove(pmap_kernel(), va, va + ubc_winsize);
LIST_REMOVE(umap, hash);
umap->uobj = NULL;