kernel: get rid of active.Lock and active.thunderbirdsargo

14 files changed, 0 insertions, 17 deletions

diff --git a/sys/src/9/bcm/dat.h b/sys/src/9/bcm/dat.h
index 56a5383ec..6f41f4563 100644
--- a/sys/src/9/bcm/dat.h
+++ b/sys/src/9/bcm/dat.h
@@ -222,7 +222,6 @@ typedef void		KMap;
 
 struct
 {
-	Lock;
 	char	machs[MAXMACH];		/* active CPUs */
 	int	exiting;		/* shutdown */
 }active;
diff --git a/sys/src/9/kw/dat.h b/sys/src/9/kw/dat.h
index 95804e329..ed0f15bcc 100644
--- a/sys/src/9/kw/dat.h
+++ b/sys/src/9/kw/dat.h
@@ -193,7 +193,6 @@ typedef void		KMap;
 
 struct
 {
-	Lock;
 	char	machs[MAXMACH];		/* active CPUs */
 	int	exiting;		/* shutdown */
 }active;
diff --git a/sys/src/9/mtx/dat.h b/sys/src/9/mtx/dat.h
index 3db9d2290..76bb8c856 100644
--- a/sys/src/9/mtx/dat.h
+++ b/sys/src/9/mtx/dat.h
@@ -180,7 +180,6 @@ struct Mach
 
 struct
 {
-	Lock;
 	char	machs[MAXMACH];
 	int	exiting;
 }active;
diff --git a/sys/src/9/omap/dat.h b/sys/src/9/omap/dat.h
index 0f0c5d6a4..466838cf6 100644
--- a/sys/src/9/omap/dat.h
+++ b/sys/src/9/omap/dat.h
@@ -215,7 +215,6 @@ typedef void		KMap;
 
 struct
 {
-	Lock;
 	char	machs[MAXMACH];		/* active CPUs */
 	int	exiting;		/* shutdown */
 }active;
diff --git a/sys/src/9/pc/dat.h b/sys/src/9/pc/dat.h
index f0157652d..6369f73de 100644
--- a/sys/src/9/pc/dat.h
+++ b/sys/src/9/pc/dat.h
@@ -269,10 +269,8 @@ void	kunmap(KMap*);
 
 struct
 {
-	Lock;
 	char	machs[MAXMACH];		/* active CPUs */
 	int	exiting;		/* shutdown */
-	int	thunderbirdsarego;	/* lets the added processors continue to schedinit */
 }active;
 
 /*
diff --git a/sys/src/9/pc/main.c b/sys/src/9/pc/main.c
index 9722a8834..2479bc071 100644
--- a/sys/src/9/pc/main.c
+++ b/sys/src/9/pc/main.c
@@ -167,7 +167,6 @@ main(void)
 	pageinit();
 	swapinit();
 	userinit();
-	active.thunderbirdsarego = 1;
 	schedinit();
 }
 
diff --git a/sys/src/9/pc64/dat.h b/sys/src/9/pc64/dat.h
index e3554a1be..4da598ff1 100644
--- a/sys/src/9/pc64/dat.h
+++ b/sys/src/9/pc64/dat.h
@@ -232,10 +232,8 @@ typedef void KMap;
 
 struct
 {
-	Lock;
 	char	machs[MAXMACH];		/* bitmap of active CPUs */
 	int	exiting;		/* shutdown */
-	int	thunderbirdsarego;	/* lets the added processors continue to schedinit */
 }active;
 
 /*
diff --git a/sys/src/9/pc64/main.c b/sys/src/9/pc64/main.c
index b1840ed65..e1534e9b7 100644
--- a/sys/src/9/pc64/main.c
+++ b/sys/src/9/pc64/main.c
@@ -518,7 +518,6 @@ main()
 	pageinit();
 	swapinit();
 	userinit();
-	active.thunderbirdsarego = 1;
 	schedinit();
 }
 
diff --git a/sys/src/9/port/devcons.c b/sys/src/9/port/devcons.c
index 76be5ec46..67e28a83a 100644
--- a/sys/src/9/port/devcons.c
+++ b/sys/src/9/port/devcons.c
@@ -1008,11 +1008,9 @@ cpushutdown(void)
 {
 	int ms, once;
 
-	lock(&active);
 	once = active.machs[m->machno];
 	active.machs[m->machno] = 0;
 	active.exiting = 1;
-	unlock(&active);
 
 	if(once)
 		iprint("cpu%d: exiting\n", m->machno);
diff --git a/sys/src/9/ppc/dat.h b/sys/src/9/ppc/dat.h
index b04362794..6589beb44 100644
--- a/sys/src/9/ppc/dat.h
+++ b/sys/src/9/ppc/dat.h
@@ -188,7 +188,6 @@ struct Mach
 
 struct
 {
-	Lock;
 	char	machs[MAXMACH];
 	int	exiting;
 }active;
diff --git a/sys/src/9/sgi/dat.h b/sys/src/9/sgi/dat.h
index 2a2ab273c..800ed7182 100644
--- a/sys/src/9/sgi/dat.h
+++ b/sys/src/9/sgi/dat.h
@@ -203,7 +203,6 @@ struct Softtlb
 
 struct
 {
-	Lock;
 	char	machs[MAXMACH];		/* active cpus */
 	short	exiting;
 }active;
diff --git a/sys/src/9/teg2/dat.h b/sys/src/9/teg2/dat.h
index 0152c76b3..0aa54a7d0 100644
--- a/sys/src/9/teg2/dat.h
+++ b/sys/src/9/teg2/dat.h
@@ -250,7 +250,6 @@ struct
 	int	wfi;			/* bitmap of CPUs in WFI state */
 	int	stopped;		/* bitmap of CPUs stopped */
 	int	exiting;		/* shutdown */
-	int	thunderbirdsarego;	/* lets the added processors continue to schedinit */
 }active;
 
 extern register Mach* m;			/* R10 */
diff --git a/sys/src/9/xen/main.c b/sys/src/9/xen/main.c
index ab6272081..f58f4628e 100644
--- a/sys/src/9/xen/main.c
+++ b/sys/src/9/xen/main.c
@@ -106,7 +106,6 @@ main(void)
 
 	swapinit();
 	userinit();
-	active.thunderbirdsarego = 1;
 	schedinit();
 }
 
diff --git a/sys/src/9/zynq/dat.h b/sys/src/9/zynq/dat.h
index a1d50b40b..7431ed803 100644
--- a/sys/src/9/zynq/dat.h
+++ b/sys/src/9/zynq/dat.h
@@ -174,7 +174,6 @@ struct ISAConf
 
 struct
 {
-	Lock;
 	char	machs[MAXMACH];		/* active CPUs */
 	int	exiting;		/* shutdown */
 }active;