3 files changed, 5 insertions(+), 34 deletions(-)

M port/fault.c
M port/portdat.h
M port/qio.c

@@ 7,35 7,6 @@
 
 void	faulterror(char*);
 
-ulong
-getpte(ulong addr)
-{
-	Pte **p, *etp;
-	Segment *s;
-	Page **pg;
-	ulong soff;
-
-	s = seg(up, addr, 1);
-	if(s == 0)
-		return -1;
-
-	addr &= ~(BY2PG-1);
-	soff = addr-s->base;
-	p = &s->map[soff/PTEMAPMEM];
-	if(*p == 0) {
-		qunlock(&s->lk);
-		return -1;
-	}
-	etp = *p;
-	pg = &etp->pages[(soff&(PTEMAPMEM-1))/BY2PG];
-	if(*pg == 0) {
-		qunlock(&s->lk);
-		return -1;
-	}
-	qunlock(&s->lk);
-	return (*pg)->pa;
-}
-
 int
 fault(ulong addr, int read)
 {

@@ 599,8 599,7 @@ struct Proc
 	void	*dbgreg;	/* User registers for devproc */
 	ulong	svstatus;
 	ulong	svr1;
-int entpc;
-int entr31;
+
 	/*
 	 *  machine specific MMU
 	 */

@@ 404,15 404,16 @@ qread(Queue *q, void *vp, int len)
 		x = splhi();
 		lock(q);
 
+		b = q->bfirst;
+		if(b)
+			break;
+
 		if(q->state & Qclosed){
 			unlock(q);
 			splx(x);
 			return 0;
 		}
 
-		b = q->bfirst;
-		if(b)
-			break;
 		q->state |= Qstarve;
 		unlock(q);
 		splx(x);