Fixed breakage for "default" configurations in mptable_pass1().

7 files changed, 14 insertions, 14 deletions

diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index c817925..96c76ac 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.17 1997/06/02 10:44:08 dfr Exp $
+ *	$Id: mp_machdep.c,v 1.18 1997/06/22 16:03:18 peter Exp $
  */
 
 #include "opt_smp.h"
@@ -587,7 +587,7 @@ mptable_pass1(void)
 		io_apic_address[0] = DEFAULT_IO_APIC_BASE;
 
 		/* fill in with defaults */
-		mp_naps = 1;
+		mp_naps = 2;		/* includes BSP */
 		mp_nbusses = default_data[mpfps->mpfb1 - 1][0];
 #if defined(APIC_IO)
 		mp_napics = 1;
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index c817925..96c76ac 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.17 1997/06/02 10:44:08 dfr Exp $
+ *	$Id: mp_machdep.c,v 1.18 1997/06/22 16:03:18 peter Exp $
  */
 
 #include "opt_smp.h"
@@ -587,7 +587,7 @@ mptable_pass1(void)
 		io_apic_address[0] = DEFAULT_IO_APIC_BASE;
 
 		/* fill in with defaults */
-		mp_naps = 1;
+		mp_naps = 2;		/* includes BSP */
 		mp_nbusses = default_data[mpfps->mpfb1 - 1][0];
 #if defined(APIC_IO)
 		mp_napics = 1;
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index c817925..96c76ac 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.17 1997/06/02 10:44:08 dfr Exp $
+ *	$Id: mp_machdep.c,v 1.18 1997/06/22 16:03:18 peter Exp $
  */
 
 #include "opt_smp.h"
@@ -587,7 +587,7 @@ mptable_pass1(void)
 		io_apic_address[0] = DEFAULT_IO_APIC_BASE;
 
 		/* fill in with defaults */
-		mp_naps = 1;
+		mp_naps = 2;		/* includes BSP */
 		mp_nbusses = default_data[mpfps->mpfb1 - 1][0];
 #if defined(APIC_IO)
 		mp_napics = 1;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index c817925..96c76ac 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.17 1997/06/02 10:44:08 dfr Exp $
+ *	$Id: mp_machdep.c,v 1.18 1997/06/22 16:03:18 peter Exp $
  */
 
 #include "opt_smp.h"
@@ -587,7 +587,7 @@ mptable_pass1(void)
 		io_apic_address[0] = DEFAULT_IO_APIC_BASE;
 
 		/* fill in with defaults */
-		mp_naps = 1;
+		mp_naps = 2;		/* includes BSP */
 		mp_nbusses = default_data[mpfps->mpfb1 - 1][0];
 #if defined(APIC_IO)
 		mp_napics = 1;
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index c817925..96c76ac 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.17 1997/06/02 10:44:08 dfr Exp $
+ *	$Id: mp_machdep.c,v 1.18 1997/06/22 16:03:18 peter Exp $
  */
 
 #include "opt_smp.h"
@@ -587,7 +587,7 @@ mptable_pass1(void)
 		io_apic_address[0] = DEFAULT_IO_APIC_BASE;
 
 		/* fill in with defaults */
-		mp_naps = 1;
+		mp_naps = 2;		/* includes BSP */
 		mp_nbusses = default_data[mpfps->mpfb1 - 1][0];
 #if defined(APIC_IO)
 		mp_napics = 1;
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index c817925..96c76ac 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.17 1997/06/02 10:44:08 dfr Exp $
+ *	$Id: mp_machdep.c,v 1.18 1997/06/22 16:03:18 peter Exp $
  */
 
 #include "opt_smp.h"
@@ -587,7 +587,7 @@ mptable_pass1(void)
 		io_apic_address[0] = DEFAULT_IO_APIC_BASE;
 
 		/* fill in with defaults */
-		mp_naps = 1;
+		mp_naps = 2;		/* includes BSP */
 		mp_nbusses = default_data[mpfps->mpfb1 - 1][0];
 #if defined(APIC_IO)
 		mp_napics = 1;
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index c817925..96c76ac 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.17 1997/06/02 10:44:08 dfr Exp $
+ *	$Id: mp_machdep.c,v 1.18 1997/06/22 16:03:18 peter Exp $
  */
 
 #include "opt_smp.h"
@@ -587,7 +587,7 @@ mptable_pass1(void)
 		io_apic_address[0] = DEFAULT_IO_APIC_BASE;
 
 		/* fill in with defaults */
-		mp_naps = 1;
+		mp_naps = 2;		/* includes BSP */
 		mp_nbusses = default_data[mpfps->mpfb1 - 1][0];
 #if defined(APIC_IO)
 		mp_napics = 1;