From 7aaa5f35218ed33294186fd33e3f79b157ad3a86 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Mon, 9 May 1994 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1994-05-09

---
 port/chan.c  | 3 ++-
 port/swap.c  | 2 +-
 power/dat.h  | 5 -----
 power/main.c | 5 -----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/port/chan.c b/port/chan.c
index 408b207b088fac62bc65c89f5f055fe863c3c90e..419047e7813d2943decbafe057960ecad79eba78 100644
--- a/port/chan.c
+++ b/port/chan.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);
diff --git a/port/swap.c b/port/swap.c
index d235a1a0d09dd5cdebb805ab15bd071e5db42da1..cd8b3c004b38fe273b449f1a6c09aeb219442980 100644
--- a/port/swap.c
+++ b/port/swap.c
@@ -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;
diff --git a/power/dat.h b/power/dat.h
index 7f773ec0e1a728fa6b9c8067c89729c294c45a1a..ba8e1203c61873611771acb48a40661f91f8d025 100644
--- a/power/dat.h
+++ b/power/dat.h
@@ -118,11 +118,6 @@ struct Mach
 	Schedq	hiq;
 	Schedq	loq;
 
-	Callbk*	cbin;
-	Callbk*	cbout;
-	Callbk*	cbend;
-	Callbk	calls[NCALLBACK];
-
 	int	stack[1];
 };
 
diff --git a/power/main.c b/power/main.c
index e47156c533889f0dd1c48476afb211643912c434..df439c79c874dbb1e5b88f2eb9a885576ed074d2 100644
--- a/power/main.c
+++ b/power/main.c
@@ -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