5 files changed, 1 insertions, 31 deletions
diff --git a/sys/src/9/pc/dat.h b/sys/src/9/pc/dat.h
index 5e5b4ea3a..a4544debf 100644
--- a/sys/src/9/pc/dat.h
+++ b/sys/src/9/pc/dat.h
@@ -279,7 +279,6 @@ struct
 	int	exiting;		/* shutdown */
 	int	ispanic;		/* shutdown in response to a panic */
 	int	thunderbirdsarego;	/* lets the added processors continue to schedinit */
-	int	rebooting;		/* about to rebooting another kernel */
 }active;
 
 /*
diff --git a/sys/src/9/pc/main.c b/sys/src/9/pc/main.c
index 2aac28073..f1e40b6de 100644
--- a/sys/src/9/pc/main.c
+++ b/sys/src/9/pc/main.c
@@ -188,7 +188,6 @@ mach0init(void)
 
 	active.machs = 1;
 	active.exiting = 0;
-	active.rebooting = 0;
 }
 
 void
@@ -972,21 +971,8 @@ reboot(void *entry, void *code, ulong size)
 		procwired(up, 0);
 		sched();
 	}
-
-	lock(&active);
-	active.rebooting = 1;
-	unlock(&active);
-
 	shutdown(0);
 
-	/*
-	 * should be the only processor running now
-	 */
-	if (m->machno != 0)
-		iprint("on cpu%d (not 0)!\n", m->machno);
-	if (active.machs)
-		iprint("still have active ap processors!\n");
-
 	iprint("shutting down...\n");
 	delay(200);
 
diff --git a/sys/src/9/pc/mp.c b/sys/src/9/pc/mp.c
index a3afc885d..ef027ece6 100644
--- a/sys/src/9/pc/mp.c
+++ b/sys/src/9/pc/mp.c
@@ -623,7 +623,7 @@ mpshutdown(void)
 	/*
 	 * Park application processors.
 	 */
-	if(active.rebooting || m->machno != 0){
+	if(m->machno != 0){
 		splhi();
 		arch->introff();
 		idle();
diff --git a/sys/src/9/pc64/dat.h b/sys/src/9/pc64/dat.h
index d188508b0..c5426b986 100644
--- a/sys/src/9/pc64/dat.h
+++ b/sys/src/9/pc64/dat.h
@@ -244,7 +244,6 @@ struct
 	int	exiting;		/* shutdown */
 	int	ispanic;		/* shutdown in response to a panic */
 	int	thunderbirdsarego;	/* lets the added processors continue to schedinit */
-	int	rebooting;		/* about to rebooting another kernel */
 }active;
 
 /*
diff --git a/sys/src/9/pc64/main.c b/sys/src/9/pc64/main.c
index 31268638c..175fac319 100644
--- a/sys/src/9/pc64/main.c
+++ b/sys/src/9/pc64/main.c
@@ -291,7 +291,6 @@ mach0init(void)
 
 	active.machs = 1;
 	active.exiting = 0;
-	active.rebooting = 0;
 }
 
 
@@ -568,21 +567,8 @@ reboot(void *entry, void *code, ulong size)
 		procwired(up, 0);
 		sched();
 	}
-
-	lock(&active);
-	active.rebooting = 1;
-	unlock(&active);
-
 	shutdown(0);
 
-	/*
-	 * should be the only processor running now
-	 */
-	if (m->machno != 0)
-		iprint("on cpu%d (not 0)!\n", m->machno);
-	if (active.machs)
-		iprint("still have active ap processors!\n");
-
 	iprint("shutting down...\n");
 	delay(200);