define SDETACH and SNUSIG

[unix-history] / usr / src / sys / kern / kern_physio.c

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index 7851aa9..83f411a 100644 (file)
--- a/usr/src/sys/kern/kern_physio.c
+++ b/usr/src/sys/kern/kern_physio.c
@@ -1,4 +1,4 @@
-/*     kern_physio.c   3.4     %H%     */
+/*     kern_physio.c   3.8     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -387,8 +387,7 @@ done:
 struct buf *
 geteblk()
 {
 struct buf *
 geteblk()
 {

-       register struct buf *bp, *dp, *ep;
-       register int i, x;
+       register struct buf *bp, *dp;

 
 loop:
        (void) spl6();
 
 loop:
        (void) spl6();


@@ -585,8 +584,6 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                bp->b_bcount = c;
                bp->b_blkno = dblkno;
                bp->b_dev = dev;
                bp->b_bcount = c;
                bp->b_blkno = dblkno;
                bp->b_dev = dev;

-               if (dev == swapdev)
-                       bp->b_blkno += swplo;

                (*bdevsw[major(dev)].d_strategy)(bp);
                if (flag & B_DIRTY) {
                        if (c < nbytes)
                (*bdevsw[major(dev)].d_strategy)(bp);
                if (flag & B_DIRTY) {
                        if (c < nbytes)


@@ -642,7 +639,7 @@ swkill(p, rout)
         * done by user) after killing it so noone will try
         * to swap it out.
         */
         * done by user) after killing it so noone will try
         * to swap it out.
         */

-       psignal(p, SIGKIL);
+       psignal(p, SIGKILL);

        p->p_flag |= SULOCK;
 }
 
        p->p_flag |= SULOCK;
 }