From a8f2ff13c2faf93f08de6fc973b143a1b77f5062 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 5 Nov 1993 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1993-11-05

---
 port/devmnt.c | 2 +-
 port/swap.c   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/port/devmnt.c b/port/devmnt.c
index 15b2c22a5ac2542bd6080cd32e200f925a833a35..f1f2ae894086df93efcef1b19d6c85134ada3c4a 100644
--- a/port/devmnt.c
+++ b/port/devmnt.c
@@ -604,7 +604,7 @@ mountrpc(Mnt *m, Mntrpc *r)
 		if(t == r->request.type+1)
 			break;
 		print("mnt: mismatch rep 0x%lux T%d R%d rq %d fls %d rp %d\n",
-			r, t, r->reply.type, r->request.tag, 
+			r, r->request.type, r->reply.type, r->request.tag, 
 			r->flushtag, r->reply.tag);
 		error(Emountrpc);
 	}
diff --git a/port/swap.c b/port/swap.c
index 8e6cf6fb6d24ef22ffe2117bf295f4482983251f..18212ba2a46008c08347be997ba47f53f0c6fcb1 100644
--- a/port/swap.c
+++ b/port/swap.c
@@ -115,14 +115,14 @@ loop:
 		if(p >= ep)
 			p = proctab(0);
 
+		if(p->state == Dead || p->kp)
+			continue;
+
 		/* don't swap out programs from devroot.c */
 		img = p->seg[SG_TEXT]->image;
 		if(img && devchar[img->c->type] == '/')
 			continue;
 
-		if(p->state == Dead || p->kp)
-			continue;
-
 		if(swapimage.c) {
 			for(i = 0; i < NSEG; i++) {
 				if(!needpages(junk))