4 files changed, 3 insertions(+), 12 deletions(-)

M port/chan.c
M port/swap.c
M power/dat.h
M power/main.c

@@ 288,7 288,8 @@ unmount(Chan *mnt, Chan *mounted)
 	p = &m->mount;
 	for(f = *p; f; f = f->next) {
 		/* BUG: Needs to be 2 pass */
-		if(eqchan(f->to, mounted, 1) || eqchan(f->to->mchan, mounted, 1)) {
+		if(eqchan(f->to, mounted, 1) ||
+		  (f->to->mchan && eqchan(f->to->mchan, mounted, 1))) {
 			*p = f->next;
 			f->next = 0;
 			mountfree(f);

@@ 261,7 261,7 @@ pagepte(int type, Page **pg)
 
 	outp = *pg;
 	switch(type) {
-	case SG_TEXT:					/* Revert to demand load */
+	case SG_TEXT:				/* Revert to demand load */
 		putpage(outp);
 		*pg = 0;
 		break;

@@ 118,11 118,6 @@ struct Mach
 	Schedq	hiq;
 	Schedq	loq;
 
-	Callbk*	cbin;
-	Callbk*	cbout;
-	Callbk*	cbend;
-	Callbk	calls[NCALLBACK];
-
 	int	stack[1];
 };
 

@@ 59,11 59,6 @@ machinit(void)
 	m->stb = &stlb[n][0];
 
 	m->ledval = 0xff;
-
-	/* Setup call back ring buffer */
-	m->cbin = m->calls;
-	m->cbout = m->calls;
-	m->cbend = &m->calls[NCALLBACK];
 }
 
 void