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

add UVM stuff.

Browse Source
This commit is contained in:
chs 1998-02-07 17:28:18 +00:00
parent 50328f94f4
commit abf50cf8c3
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/sparc/dev/if_ie_obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie_obio.c,v 1.1 1998/01/25 19:50:50 pk Exp $ */
/* $NetBSD: if_ie_obio.c,v 1.2 1998/02/07 17:28:18 chs Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -99,6 +99,9 @@
#include <net/if_ether.h>
#include <vm/vm.h>
#ifdef UVM
#include <uvm/uvm.h>
#endif
#include <machine/autoconf.h>
#include <machine/cpu.h>
@ -305,12 +308,21 @@ ie_obio_attach(parent, self, aux)
* XXX-should provide bus support for 24-bit devices..
*/
#ifdef UVM
ie_map = uvm_map_create(pmap_kernel(), (vm_offset_t)IEOB_ADBASE,
(vm_offset_t)IEOB_ADBASE + sc->sc_msize, TRUE);
#else
ie_map = vm_map_create(pmap_kernel(), (vm_offset_t)IEOB_ADBASE,
(vm_offset_t)IEOB_ADBASE + sc->sc_msize, 1);
#endif
if (ie_map == NULL)
panic("ie_map");
#ifdef UVM
sc->sc_maddr = (caddr_t) uvm_km_alloc(ie_map, sc->sc_msize);
#else
sc->sc_maddr = (caddr_t) kmem_alloc(ie_map, sc->sc_msize);
#endif
if (sc->sc_maddr == NULL)
panic("ie kmem_alloc");

7
sys/ufs/lfs/lfs_alloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_alloc.c,v 1.9 1997/07/04 20:22:17 drochner Exp $ */
/* $NetBSD: lfs_alloc.c,v 1.10 1998/02/07 17:29:04 chs Exp $ */
/*
* Copyright (c) 1991, 1993
@ -100,8 +100,13 @@ lfs_valloc(v)
blkno = lblkno(fs, ip->i_ffs_size);
lfs_balloc(vp, fs->lfs_bsize, blkno, &bp);
ip->i_ffs_size += fs->lfs_bsize;
#ifdef UVM
uvm_vnp_setsize(vp, ip->i_ffs_size);
(void)uvm_vnp_uncache(vp);
#else
vnode_pager_setsize(vp, ip->i_ffs_size);
vnode_pager_uncache(vp);
#endif
i = (blkno - fs->lfs_segtabsz - fs->lfs_cleansz) *
fs->lfs_ifpb;

10
sys/ufs/lfs/lfs_inode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_inode.c,v 1.10 1997/07/04 20:22:18 drochner Exp $ */
/* $NetBSD: lfs_inode.c,v 1.11 1998/02/07 17:29:07 chs Exp $ */
/*
* Copyright (c) 1986, 1989, 1991, 1993
@ -175,7 +175,11 @@ lfs_truncate(v)
ip->i_flag |= IN_CHANGE | IN_UPDATE;
return (VOP_UPDATE(vp, &ts, &ts, 0));
}
#ifdef UVM
uvm_vnp_setsize(vp, length);
#else
vnode_pager_setsize(vp, length);
#endif
fs = ip->i_lfs;
@ -212,7 +216,11 @@ lfs_truncate(v)
return (e1);
ip->i_ffs_size = length;
size = blksize(fs);
#ifdef UVM
(void)uvm_vnp_uncache(vp);
#else
(void)vnode_pager_uncache(vp);
#endif
bzero((char *)bp->b_data + offset, (u_int)(size - offset));
allocbuf(bp, size);
if ((e1 = VOP_BWRITE(bp)) != 0)