--- Net2/vm/swap_pager.c 2018/04/24 18:04:44 1.1.1.2 +++ Net2/vm/swap_pager.c 2018/04/24 18:09:23 1.1.1.4 @@ -37,9 +37,17 @@ * * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ * + * + * PATCHES MAGIC LEVEL PATCH THAT GOT US HERE + * -------------------- ----- ---------------------- + * CURRENT PATCH LEVEL: 1 00075 + * -------------------- ----- ---------------------- + * + * 22 Jan 1993 Bruce Evans Fixed unmatched spl calls + * * @(#)swap_pager.c 7.4 (Berkeley) 5/7/91 */ -static char rcsid[] = "$Header: /var/lib/cvsd/net2/Net2/vm/swap_pager.c,v 1.1.1.2 2018/04/24 18:04:44 root Exp $"; +static char rcsid[] = "$Header: /var/lib/cvsd/net2/Net2/vm/swap_pager.c,v 1.1.1.4 2018/04/24 18:09:23 root Exp $"; /* * Quick hack to page to dedicated partition(s). @@ -553,13 +561,13 @@ swap_pager_io(swp, m, flags) splx(s); return(VM_PAGER_FAIL); } - splx(s); #ifdef DEBUG if (swpagerdebug & (SDB_FULL|SDB_ALLOCBLK)) printf("swpg_io: %x alloc blk %x at ix %x\n", swp->sw_blocks, swb->swb_block, ix); #endif } + splx(s); /* * Allocate a kernel virtual address and initialize so that PTE @@ -665,7 +673,7 @@ swap_pager_io(swp, m, flags) --swap_pager_poip; #endif rv = (bp->b_flags & B_ERROR) ? VM_PAGER_FAIL : VM_PAGER_OK; - bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_PAGET|B_UAREA|B_DIRTY); + bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_DIRTY); bp->av_forw = bswlist.av_forw; bswlist.av_forw = bp; if (bp->b_vp) @@ -887,7 +895,7 @@ printf("error %d blkno %d sz %d ", bp->b thread_wakeup((int)spc->spc_swp); } - bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_PAGET|B_UAREA|B_DIRTY); + bp->b_flags &= ~(B_BUSY|B_WANTED|B_PHYS|B_DIRTY); bp->av_forw = bswlist.av_forw; bswlist.av_forw = bp; if (bp->b_vp)