Backout early start of APs since it caused some machines to hang.

7 files changed, 7 insertions, 28 deletions

diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index a6585b0..eca2601 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
 	for (i = 0; i < mp_ncpus; i++) {
 		bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
 	}
-	wait_ap(1000000);
-	if (smp_started == 0)
-		printf("WARNING: Failed to start all APs\n");
 
 	/* number of APs actually started */
 	return mp_ncpus - 1;
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index a6585b0..eca2601 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
 	for (i = 0; i < mp_ncpus; i++) {
 		bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
 	}
-	wait_ap(1000000);
-	if (smp_started == 0)
-		printf("WARNING: Failed to start all APs\n");
 
 	/* number of APs actually started */
 	return mp_ncpus - 1;
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index a6585b0..eca2601 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
 	for (i = 0; i < mp_ncpus; i++) {
 		bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
 	}
-	wait_ap(1000000);
-	if (smp_started == 0)
-		printf("WARNING: Failed to start all APs\n");
 
 	/* number of APs actually started */
 	return mp_ncpus - 1;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index a6585b0..eca2601 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
 	for (i = 0; i < mp_ncpus; i++) {
 		bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
 	}
-	wait_ap(1000000);
-	if (smp_started == 0)
-		printf("WARNING: Failed to start all APs\n");
 
 	/* number of APs actually started */
 	return mp_ncpus - 1;
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index a6585b0..eca2601 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
 	for (i = 0; i < mp_ncpus; i++) {
 		bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
 	}
-	wait_ap(1000000);
-	if (smp_started == 0)
-		printf("WARNING: Failed to start all APs\n");
 
 	/* number of APs actually started */
 	return mp_ncpus - 1;
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index a6585b0..eca2601 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
 	for (i = 0; i < mp_ncpus; i++) {
 		bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
 	}
-	wait_ap(1000000);
-	if (smp_started == 0)
-		printf("WARNING: Failed to start all APs\n");
 
 	/* number of APs actually started */
 	return mp_ncpus - 1;
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index a6585b0..eca2601 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.95 1999/04/10 22:58:28 tegge Exp $
+ *	$Id: mp_machdep.c,v 1.96 1999/04/11 00:43:43 tegge Exp $
  */
 
 #include "opt_smp.h"
@@ -1930,9 +1930,6 @@ start_all_aps(u_int boot_addr)
 	for (i = 0; i < mp_ncpus; i++) {
 		bcopy( (int *) PTD + KPTDI, (int *) IdlePTDS[i] + KPTDI, NKPDE * sizeof (int));
 	}
-	wait_ap(1000000);
-	if (smp_started == 0)
-		printf("WARNING: Failed to start all APs\n");
 
 	/* number of APs actually started */
 	return mp_ncpus - 1;