mirror of
https://github.com/opnsense/src.git
synced 2026-06-10 17:22:46 -04:00
Fixed some formatting weirdness that I overlooked in the previous commit.
This commit is contained in:
parent
39b3568a26
commit
480dff540b
14 changed files with 77 additions and 77 deletions
|
|
@ -18,7 +18,7 @@
|
|||
* 5. Modifications may be freely made to this file if the above conditions
|
||||
* are met.
|
||||
*
|
||||
* $Id: vfs_bio.c,v 1.16 1994/10/23 20:52:11 davidg Exp $
|
||||
* $Id: vfs_bio.c,v 1.17 1995/01/09 16:04:52 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -498,7 +498,7 @@ bawrite(struct buf * bp)
|
|||
|
||||
while (bp->b_vp->v_numoutput > 16) {
|
||||
bp->b_vp->v_flag |= VBWAIT;
|
||||
tsleep((caddr_t) & bp->b_vp->v_numoutput, PRIBIO, "bawnmo", 0);
|
||||
tsleep((caddr_t) &bp->b_vp->v_numoutput, PRIBIO, "bawnmo", 0);
|
||||
}
|
||||
splx(s);
|
||||
}
|
||||
|
|
@ -523,7 +523,7 @@ brelse(struct buf * bp)
|
|||
|
||||
if (needsbuffer) {
|
||||
needsbuffer = 0;
|
||||
wakeup((caddr_t) & needsbuffer);
|
||||
wakeup((caddr_t) &needsbuffer);
|
||||
}
|
||||
/* anyone need this block? */
|
||||
if (bp->b_flags & B_WANTED) {
|
||||
|
|
@ -752,7 +752,7 @@ start:
|
|||
if (!bp) {
|
||||
/* wait for a free buffer of any kind */
|
||||
needsbuffer = 1;
|
||||
tsleep((caddr_t) & needsbuffer, PRIBIO | slpflag, "newbuf", slptimeo);
|
||||
tsleep((caddr_t) &needsbuffer, PRIBIO | slpflag, "newbuf", slptimeo);
|
||||
splx(s);
|
||||
return (0);
|
||||
}
|
||||
|
|
@ -890,13 +890,13 @@ getblk(struct vnode * vp, daddr_t blkno, int size, int slpflag, int slptimeo)
|
|||
loop:
|
||||
if ((cnt.v_free_count + cnt.v_cache_count) <
|
||||
cnt.v_free_reserved + MAXBSIZE / PAGE_SIZE)
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
if (bp = incore(vp, blkno)) {
|
||||
if (bp->b_flags & B_BUSY) {
|
||||
bp->b_flags |= B_WANTED;
|
||||
if (curproc == pageproc) {
|
||||
bp->b_flags |= B_PDWANTED;
|
||||
wakeup((caddr_t) & cnt.v_free_count);
|
||||
wakeup((caddr_t) &cnt.v_free_count);
|
||||
}
|
||||
if (!tsleep((caddr_t) bp, PRIBIO | slpflag, "getblk", slptimeo))
|
||||
goto loop;
|
||||
|
|
@ -1395,7 +1395,7 @@ vfs_update()
|
|||
{
|
||||
(void) spl0();
|
||||
while (1) {
|
||||
tsleep((caddr_t) & vfs_update_wakeup, PRIBIO, "update",
|
||||
tsleep((caddr_t) &vfs_update_wakeup, PRIBIO, "update",
|
||||
hz * vfs_update_interval);
|
||||
vfs_update_wakeup = 0;
|
||||
sync(curproc, NULL, NULL);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)vfs_subr.c 8.13 (Berkeley) 4/18/94
|
||||
* $Id: vfs_subr.c,v 1.13 1994/12/23 04:52:55 davidg Exp $
|
||||
* $Id: vfs_subr.c,v 1.14 1995/01/09 16:04:54 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -148,7 +148,7 @@ vfs_busy(mp)
|
|||
|
||||
while (mp->mnt_flag & MNT_MPBUSY) {
|
||||
mp->mnt_flag |= MNT_MPWANT;
|
||||
(void) tsleep((caddr_t) & mp->mnt_flag, PVFS, "vfsbsy", 0);
|
||||
(void) tsleep((caddr_t) &mp->mnt_flag, PVFS, "vfsbsy", 0);
|
||||
}
|
||||
if (mp->mnt_flag & MNT_UNMOUNT)
|
||||
return (1);
|
||||
|
|
@ -170,7 +170,7 @@ vfs_unbusy(mp)
|
|||
mp->mnt_flag &= ~MNT_MPBUSY;
|
||||
if (mp->mnt_flag & MNT_MPWANT) {
|
||||
mp->mnt_flag &= ~MNT_MPWANT;
|
||||
wakeup((caddr_t) & mp->mnt_flag);
|
||||
wakeup((caddr_t) &mp->mnt_flag);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -419,7 +419,7 @@ vwakeup(bp)
|
|||
panic("vwakeup: neg numoutput");
|
||||
if (vp->v_flag & VBWAIT) {
|
||||
vp->v_flag &= ~VBWAIT;
|
||||
wakeup((caddr_t) & vp->v_numoutput);
|
||||
wakeup((caddr_t) &vp->v_numoutput);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1304,7 +1304,7 @@ again:
|
|||
*sizep = bp - where;
|
||||
return (ENOMEM);
|
||||
}
|
||||
if ((error = copyout((caddr_t) & vp, bp, VPTRSZ)) ||
|
||||
if ((error = copyout((caddr_t) &vp, bp, VPTRSZ)) ||
|
||||
(error = copyout((caddr_t) vp, bp + VPTRSZ, VNODESZ)))
|
||||
return (error);
|
||||
bp += VPTRSZ + VNODESZ;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)vfs_subr.c 8.13 (Berkeley) 4/18/94
|
||||
* $Id: vfs_subr.c,v 1.13 1994/12/23 04:52:55 davidg Exp $
|
||||
* $Id: vfs_subr.c,v 1.14 1995/01/09 16:04:54 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -148,7 +148,7 @@ vfs_busy(mp)
|
|||
|
||||
while (mp->mnt_flag & MNT_MPBUSY) {
|
||||
mp->mnt_flag |= MNT_MPWANT;
|
||||
(void) tsleep((caddr_t) & mp->mnt_flag, PVFS, "vfsbsy", 0);
|
||||
(void) tsleep((caddr_t) &mp->mnt_flag, PVFS, "vfsbsy", 0);
|
||||
}
|
||||
if (mp->mnt_flag & MNT_UNMOUNT)
|
||||
return (1);
|
||||
|
|
@ -170,7 +170,7 @@ vfs_unbusy(mp)
|
|||
mp->mnt_flag &= ~MNT_MPBUSY;
|
||||
if (mp->mnt_flag & MNT_MPWANT) {
|
||||
mp->mnt_flag &= ~MNT_MPWANT;
|
||||
wakeup((caddr_t) & mp->mnt_flag);
|
||||
wakeup((caddr_t) &mp->mnt_flag);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -419,7 +419,7 @@ vwakeup(bp)
|
|||
panic("vwakeup: neg numoutput");
|
||||
if (vp->v_flag & VBWAIT) {
|
||||
vp->v_flag &= ~VBWAIT;
|
||||
wakeup((caddr_t) & vp->v_numoutput);
|
||||
wakeup((caddr_t) &vp->v_numoutput);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1304,7 +1304,7 @@ again:
|
|||
*sizep = bp - where;
|
||||
return (ENOMEM);
|
||||
}
|
||||
if ((error = copyout((caddr_t) & vp, bp, VPTRSZ)) ||
|
||||
if ((error = copyout((caddr_t) &vp, bp, VPTRSZ)) ||
|
||||
(error = copyout((caddr_t) vp, bp + VPTRSZ, VNODESZ)))
|
||||
return (error);
|
||||
bp += VPTRSZ + VNODESZ;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
* from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
|
||||
*
|
||||
* @(#)swap_pager.c 8.9 (Berkeley) 3/21/94
|
||||
* $Id: swap_pager.c,v 1.21 1994/12/23 04:56:50 davidg Exp $
|
||||
* $Id: swap_pager.c,v 1.22 1995/01/09 16:05:33 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -450,7 +450,7 @@ swap_pager_reclaim()
|
|||
*/
|
||||
s = splbio();
|
||||
if (in_reclaim) {
|
||||
tsleep((caddr_t) & in_reclaim, PSWP, "swrclm", 0);
|
||||
tsleep((caddr_t) &in_reclaim, PSWP, "swrclm", 0);
|
||||
splx(s);
|
||||
return;
|
||||
}
|
||||
|
|
@ -494,12 +494,12 @@ rfinished:
|
|||
*/
|
||||
for (i = 0; i < reclaimcount; i++) {
|
||||
swap_pager_freeswapspace(reclaims[i], reclaims[i] + btodb(PAGE_SIZE) - 1);
|
||||
wakeup((caddr_t) & in_reclaim);
|
||||
wakeup((caddr_t) &in_reclaim);
|
||||
}
|
||||
|
||||
splx(s);
|
||||
in_reclaim = 0;
|
||||
wakeup((caddr_t) & in_reclaim);
|
||||
wakeup((caddr_t) &in_reclaim);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1016,15 +1016,15 @@ swap_pager_input(swp, m, count, reqpage)
|
|||
if (curproc == pageproc)
|
||||
(void) swap_pager_clean();
|
||||
else
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
while (swap_pager_free.tqh_first == NULL) {
|
||||
swap_pager_needflags |= SWAP_FREE_NEEDED;
|
||||
tsleep((caddr_t) & swap_pager_free,
|
||||
tsleep((caddr_t) &swap_pager_free,
|
||||
PVM, "swpfre", 0);
|
||||
if (curproc == pageproc)
|
||||
(void) swap_pager_clean();
|
||||
else
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
}
|
||||
splx(s);
|
||||
}
|
||||
|
|
@ -1117,7 +1117,7 @@ swap_pager_input(swp, m, count, reqpage)
|
|||
TAILQ_INSERT_TAIL(&swap_pager_free, spc, spc_list);
|
||||
if (swap_pager_needflags & SWAP_FREE_NEEDED) {
|
||||
swap_pager_needflags &= ~SWAP_FREE_NEEDED;
|
||||
wakeup((caddr_t) & swap_pager_free);
|
||||
wakeup((caddr_t) &swap_pager_free);
|
||||
}
|
||||
} else {
|
||||
/*
|
||||
|
|
@ -1364,19 +1364,19 @@ swap_pager_output(swp, m, count, flags, rtvals)
|
|||
return VM_PAGER_AGAIN;
|
||||
*/
|
||||
} else
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
while (swap_pager_free.tqh_first == NULL || swap_pager_free.tqh_first->spc_list.tqe_next == NULL || swap_pager_free.tqh_first->spc_list.tqe_next->spc_list.tqe_next == NULL) {
|
||||
if (curproc == pageproc &&
|
||||
(cnt.v_free_count + cnt.v_cache_count) >= cnt.v_free_min)
|
||||
wakeup((caddr_t) & cnt.v_free_count);
|
||||
wakeup((caddr_t) &cnt.v_free_count);
|
||||
|
||||
swap_pager_needflags |= SWAP_FREE_NEEDED;
|
||||
tsleep((caddr_t) & swap_pager_free,
|
||||
tsleep((caddr_t) &swap_pager_free,
|
||||
PVM, "swpfre", 0);
|
||||
if (curproc == pageproc)
|
||||
(void) swap_pager_clean();
|
||||
else
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
}
|
||||
splx(s);
|
||||
}
|
||||
|
|
@ -1531,7 +1531,7 @@ swap_pager_output(swp, m, count, flags, rtvals)
|
|||
TAILQ_INSERT_TAIL(&swap_pager_free, spc, spc_list);
|
||||
if (swap_pager_needflags & SWAP_FREE_NEEDED) {
|
||||
swap_pager_needflags &= ~SWAP_FREE_NEEDED;
|
||||
wakeup((caddr_t) & swap_pager_free);
|
||||
wakeup((caddr_t) &swap_pager_free);
|
||||
}
|
||||
return (rv);
|
||||
}
|
||||
|
|
@ -1577,7 +1577,7 @@ doclean:
|
|||
TAILQ_INSERT_TAIL(&swap_pager_free, spc, spc_list);
|
||||
if (swap_pager_needflags & SWAP_FREE_NEEDED) {
|
||||
swap_pager_needflags &= ~SWAP_FREE_NEEDED;
|
||||
wakeup((caddr_t) & swap_pager_free);
|
||||
wakeup((caddr_t) &swap_pager_free);
|
||||
}
|
||||
++cleandone;
|
||||
splx(s);
|
||||
|
|
@ -1671,16 +1671,16 @@ swap_pager_iodone(bp)
|
|||
if ((swap_pager_needflags & SWAP_FREE_NEEDED) ||
|
||||
swap_pager_inuse.tqh_first == 0) {
|
||||
swap_pager_needflags &= ~SWAP_FREE_NEEDED;
|
||||
wakeup((caddr_t) & swap_pager_free);
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &swap_pager_free);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
}
|
||||
if (vm_pageout_pages_needed) {
|
||||
wakeup((caddr_t) & vm_pageout_pages_needed);
|
||||
wakeup((caddr_t) &vm_pageout_pages_needed);
|
||||
}
|
||||
if ((swap_pager_inuse.tqh_first == NULL) ||
|
||||
((cnt.v_free_count + cnt.v_cache_count) < cnt.v_free_min &&
|
||||
nswiodone + cnt.v_free_count + cnt.v_cache_count >= cnt.v_free_min)) {
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
}
|
||||
splx(s);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: vm_fault.c,v 1.13 1994/11/13 22:48:53 davidg Exp $
|
||||
* $Id: vm_fault.c,v 1.14 1995/01/09 16:05:39 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -1153,7 +1153,7 @@ vm_fault_additional_pages(first_object, first_offset, m, rbehind, raheada, marra
|
|||
rahead = ((cnt.v_free_count + cnt.v_cache_count) - cnt.v_free_reserved) / 2;
|
||||
rbehind = rahead;
|
||||
if (!rahead)
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
}
|
||||
/*
|
||||
* if we don't have any free pages, then just read one page.
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: vm_glue.c,v 1.10 1994/12/18 06:31:31 davidg Exp $
|
||||
* $Id: vm_glue.c,v 1.11 1995/01/09 16:05:40 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -253,11 +253,11 @@ vm_fork(p1, p2, isvfork)
|
|||
p2->p_sigacts = &up->u_sigacts;
|
||||
up->u_sigacts = *p1->p_sigacts;
|
||||
bzero(&up->u_stats.pstat_startzero,
|
||||
(unsigned) ((caddr_t) & up->u_stats.pstat_endzero -
|
||||
(caddr_t) & up->u_stats.pstat_startzero));
|
||||
(unsigned) ((caddr_t) &up->u_stats.pstat_endzero -
|
||||
(caddr_t) &up->u_stats.pstat_startzero));
|
||||
bcopy(&p1->p_stats->pstat_startcopy, &up->u_stats.pstat_startcopy,
|
||||
((caddr_t) & up->u_stats.pstat_endcopy -
|
||||
(caddr_t) & up->u_stats.pstat_startcopy));
|
||||
((caddr_t) &up->u_stats.pstat_endcopy -
|
||||
(caddr_t) &up->u_stats.pstat_startcopy));
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -372,7 +372,7 @@ scheduler()
|
|||
loop:
|
||||
while ((cnt.v_free_count + cnt.v_cache_count) < (cnt.v_free_reserved + UPAGES + 2)) {
|
||||
VM_WAIT;
|
||||
tsleep((caddr_t) & proc0, PVM, "schedm", 0);
|
||||
tsleep((caddr_t) &proc0, PVM, "schedm", 0);
|
||||
}
|
||||
|
||||
pp = NULL;
|
||||
|
|
@ -399,7 +399,7 @@ loop:
|
|||
* Nothing to do, back to sleep
|
||||
*/
|
||||
if ((p = pp) == NULL) {
|
||||
tsleep((caddr_t) & proc0, PVM, "sched", 0);
|
||||
tsleep((caddr_t) &proc0, PVM, "sched", 0);
|
||||
goto loop;
|
||||
}
|
||||
/*
|
||||
|
|
@ -483,7 +483,7 @@ retry:
|
|||
* then wakeup the sched process.
|
||||
*/
|
||||
if (didswap)
|
||||
wakeup((caddr_t) & proc0);
|
||||
wakeup((caddr_t) &proc0);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: vm_map.c,v 1.9 1994/12/18 13:58:41 davidg Exp $
|
||||
* $Id: vm_map.c,v 1.10 1995/01/09 16:05:45 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -203,7 +203,7 @@ vmspace_alloc(min, max, pageable)
|
|||
mapvmpgcnt = 0;
|
||||
}
|
||||
MALLOC(vm, struct vmspace *, sizeof(struct vmspace), M_VMMAP, M_WAITOK);
|
||||
bzero(vm, (caddr_t) & vm->vm_startcopy - (caddr_t) vm);
|
||||
bzero(vm, (caddr_t) &vm->vm_startcopy - (caddr_t) vm);
|
||||
vm_map_init(&vm->vm_map, min, max, pageable);
|
||||
pmap_pinit(&vm->vm_pmap);
|
||||
vm->vm_map.pmap = &vm->vm_pmap; /* XXX */
|
||||
|
|
@ -2140,7 +2140,7 @@ vmspace_fork(vm1)
|
|||
vm2 = vmspace_alloc(old_map->min_offset, old_map->max_offset,
|
||||
old_map->entries_pageable);
|
||||
bcopy(&vm1->vm_startcopy, &vm2->vm_startcopy,
|
||||
(caddr_t) (vm1 + 1) - (caddr_t) & vm1->vm_startcopy);
|
||||
(caddr_t) (vm1 + 1) - (caddr_t) &vm1->vm_startcopy);
|
||||
new_pmap = &vm2->vm_pmap; /* XXX */
|
||||
new_map = &vm2->vm_map; /* XXX */
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)vm_meter.c 8.4 (Berkeley) 1/4/94
|
||||
* $Id: vm_meter.c,v 1.4 1994/09/12 11:38:31 davidg Exp $
|
||||
* $Id: vm_meter.c,v 1.5 1995/01/09 16:05:47 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -52,7 +52,7 @@ vmmeter()
|
|||
if (time.tv_sec % 5 == 0)
|
||||
loadav(&averunnable);
|
||||
if (proc0.p_slptime > maxslp / 2)
|
||||
wakeup((caddr_t) & proc0);
|
||||
wakeup((caddr_t) &proc0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91
|
||||
* $Id: vm_page.c,v 1.12 1994/10/23 06:15:04 davidg Exp $
|
||||
* $Id: vm_page.c,v 1.13 1995/01/09 16:05:51 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -563,7 +563,7 @@ vm_page_unqueue(vm_page_t mem)
|
|||
cnt.v_cache_count--;
|
||||
mem->flags &= ~PG_CACHE;
|
||||
if (cnt.v_cache_count + cnt.v_free_count < cnt.v_free_reserved)
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
}
|
||||
splx(s);
|
||||
return origflags;
|
||||
|
|
@ -670,7 +670,7 @@ gotpage:
|
|||
*/
|
||||
if (curproc != pageproc &&
|
||||
((cnt.v_free_count + cnt.v_cache_count) < cnt.v_free_min))
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
|
||||
return (mem);
|
||||
}
|
||||
|
|
@ -793,7 +793,7 @@ vm_page_free(mem)
|
|||
* some free.
|
||||
*/
|
||||
if (vm_pageout_pages_needed)
|
||||
wakeup((caddr_t) & vm_pageout_pages_needed);
|
||||
wakeup((caddr_t) &vm_pageout_pages_needed);
|
||||
|
||||
/*
|
||||
* wakeup processes that are waiting on memory if we hit a
|
||||
|
|
@ -801,8 +801,8 @@ vm_page_free(mem)
|
|||
* lots of memory. this process will swapin processes.
|
||||
*/
|
||||
if ((cnt.v_free_count + cnt.v_cache_count) == cnt.v_free_min) {
|
||||
wakeup((caddr_t) & cnt.v_free_count);
|
||||
wakeup((caddr_t) & proc0);
|
||||
wakeup((caddr_t) &cnt.v_free_count);
|
||||
wakeup((caddr_t) &proc0);
|
||||
}
|
||||
} else {
|
||||
splx(s);
|
||||
|
|
@ -929,11 +929,11 @@ vm_page_cache(m)
|
|||
m->flags |= PG_CACHE;
|
||||
cnt.v_cache_count++;
|
||||
if ((cnt.v_free_count + cnt.v_cache_count) == cnt.v_free_min) {
|
||||
wakeup((caddr_t) & cnt.v_free_count);
|
||||
wakeup((caddr_t) & proc0);
|
||||
wakeup((caddr_t) &cnt.v_free_count);
|
||||
wakeup((caddr_t) &proc0);
|
||||
}
|
||||
if (vm_pageout_pages_needed)
|
||||
wakeup((caddr_t) & vm_pageout_pages_needed);
|
||||
wakeup((caddr_t) &vm_pageout_pages_needed);
|
||||
|
||||
splx(s);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: vm_pageout.c,v 1.28 1995/01/02 22:56:00 ats Exp $
|
||||
* $Id: vm_pageout.c,v 1.29 1995/01/09 16:05:53 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -483,7 +483,7 @@ vm_req_vmdaemon()
|
|||
static int lastrun = 0;
|
||||
|
||||
if ((ticks > (lastrun + hz / 10)) || (ticks < lastrun)) {
|
||||
wakeup((caddr_t) & vm_daemon_needed);
|
||||
wakeup((caddr_t) &vm_daemon_needed);
|
||||
lastrun = ticks;
|
||||
}
|
||||
}
|
||||
|
|
@ -813,7 +813,7 @@ rescan1:
|
|||
bigproc->p_estcpu = 0;
|
||||
bigproc->p_nice = PRIO_MIN;
|
||||
resetpriority(bigproc);
|
||||
wakeup((caddr_t) & cnt.v_free_count);
|
||||
wakeup((caddr_t) &cnt.v_free_count);
|
||||
}
|
||||
}
|
||||
vm_page_pagesfreed += pages_freed;
|
||||
|
|
@ -865,12 +865,12 @@ vm_pageout()
|
|||
* The pageout daemon is never done, so loop forever.
|
||||
*/
|
||||
while (TRUE) {
|
||||
tsleep((caddr_t) & vm_pages_needed, PVM, "psleep", 0);
|
||||
tsleep((caddr_t) &vm_pages_needed, PVM, "psleep", 0);
|
||||
cnt.v_pdwakeups++;
|
||||
vm_pager_sync();
|
||||
vm_pageout_scan();
|
||||
vm_pager_sync();
|
||||
wakeup((caddr_t) & cnt.v_free_count);
|
||||
wakeup((caddr_t) &cnt.v_free_count);
|
||||
wakeup((caddr_t) kmem_map);
|
||||
}
|
||||
}
|
||||
|
|
@ -883,7 +883,7 @@ vm_daemon()
|
|||
struct proc *p;
|
||||
|
||||
while (TRUE) {
|
||||
tsleep((caddr_t) & vm_daemon_needed, PUSER, "psleep", 0);
|
||||
tsleep((caddr_t) &vm_daemon_needed, PUSER, "psleep", 0);
|
||||
swapout_threads();
|
||||
/*
|
||||
* scan the processes for exceeding their rlimits or if
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: vm_pageout.h,v 1.6 1994/10/09 01:52:16 phk Exp $
|
||||
* $Id: vm_pageout.h,v 1.7 1995/01/09 16:05:54 davidg Exp $
|
||||
*/
|
||||
|
||||
#ifndef _VM_VM_PAGEOUT_H_
|
||||
|
|
@ -101,11 +101,11 @@ vm_wait()
|
|||
s = splhigh();
|
||||
if (curproc == pageproc) {
|
||||
vm_pageout_pages_needed = 1;
|
||||
tsleep((caddr_t) & vm_pageout_pages_needed, PSWP, "vmwait", 0);
|
||||
tsleep((caddr_t) &vm_pageout_pages_needed, PSWP, "vmwait", 0);
|
||||
vm_pageout_pages_needed = 0;
|
||||
} else {
|
||||
wakeup((caddr_t) & vm_pages_needed);
|
||||
tsleep((caddr_t) & cnt.v_free_count, PVM, "vmwait", 0);
|
||||
wakeup((caddr_t) &vm_pages_needed);
|
||||
tsleep((caddr_t) &cnt.v_free_count, PVM, "vmwait", 0);
|
||||
}
|
||||
splx(s);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: vm_pager.c,v 1.10 1994/12/23 04:56:51 davidg Exp $
|
||||
* $Id: vm_pager.c,v 1.11 1995/01/09 16:05:55 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -355,7 +355,7 @@ getpbuf()
|
|||
/* get a bp from the swap buffer header pool */
|
||||
while ((bp = bswlist.tqh_first) == NULL) {
|
||||
bswneeded = 1;
|
||||
tsleep((caddr_t) & bswneeded, PVM, "wswbuf", 0);
|
||||
tsleep((caddr_t) &bswneeded, PVM, "wswbuf", 0);
|
||||
}
|
||||
TAILQ_REMOVE(&bswlist, bp, b_freelist);
|
||||
splx(s);
|
||||
|
|
@ -422,7 +422,7 @@ relpbuf(bp)
|
|||
|
||||
if (bswneeded) {
|
||||
bswneeded = 0;
|
||||
wakeup((caddr_t) & bswlist);
|
||||
wakeup((caddr_t) &bswlist);
|
||||
}
|
||||
splx(s);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)vm_swap.c 8.5 (Berkeley) 2/17/94
|
||||
* $Id: vm_swap.c,v 1.12 1994/11/22 08:47:20 davidg Exp $
|
||||
* $Id: vm_swap.c,v 1.13 1995/01/09 16:05:58 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -254,7 +254,7 @@ swstrategy(bp)
|
|||
vp->v_numoutput--;
|
||||
if ((vp->v_flag & VBWAIT) && vp->v_numoutput <= 0) {
|
||||
vp->v_flag &= ~VBWAIT;
|
||||
wakeup((caddr_t) & vp->v_numoutput);
|
||||
wakeup((caddr_t) &vp->v_numoutput);
|
||||
}
|
||||
}
|
||||
sp->sw_vp->v_numoutput++;
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: vm_user.c,v 1.4 1994/10/15 10:28:47 davidg Exp $
|
||||
* $Id: vm_user.c,v 1.5 1995/01/09 16:06:00 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -100,12 +100,12 @@ svm_allocate(p, uap, retval)
|
|||
|
||||
uap->map = p->p_map; /* XXX */
|
||||
|
||||
if (copyin((caddr_t) uap->addr, (caddr_t) & addr, sizeof(addr)))
|
||||
if (copyin((caddr_t) uap->addr, (caddr_t) &addr, sizeof(addr)))
|
||||
rv = KERN_INVALID_ARGUMENT;
|
||||
else
|
||||
rv = vm_allocate(uap->map, &addr, uap->size, uap->anywhere);
|
||||
if (rv == KERN_SUCCESS) {
|
||||
if (copyout((caddr_t) & addr, (caddr_t) uap->addr, sizeof(addr)))
|
||||
if (copyout((caddr_t) &addr, (caddr_t) uap->addr, sizeof(addr)))
|
||||
rv = KERN_INVALID_ARGUMENT;
|
||||
}
|
||||
return ((int) rv);
|
||||
|
|
|
|||
Loading…
Reference in a new issue