diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 96c76acbd57b..049aa8323100 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.18 1997/06/22 16:03:18 peter Exp $
+ *	$Id: mp_machdep.c,v 1.19 1997/06/24 06:55:30 fsmp Exp $
  */
 
 #include "opt_smp.h"
@@ -1373,7 +1373,7 @@ start_all_aps(u_int boot_addr)
          *
          * get the initial mp_lock with a count of 1 for the BSP
          */
-	mp_lock = (lapic.id & APIC_ID_MASK) + 1;
+	mp_lock = 1;	/* this uses a LOGICAL cpu ID, ie BSP == 0 */
 
 	/* initialize BSP's local APIC */
 	apic_initialize(1);
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 96c76acbd57b..049aa8323100 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.18 1997/06/22 16:03:18 peter Exp $
+ *	$Id: mp_machdep.c,v 1.19 1997/06/24 06:55:30 fsmp Exp $
  */
 
 #include "opt_smp.h"
@@ -1373,7 +1373,7 @@ start_all_aps(u_int boot_addr)
          *
          * get the initial mp_lock with a count of 1 for the BSP
          */
-	mp_lock = (lapic.id & APIC_ID_MASK) + 1;
+	mp_lock = 1;	/* this uses a LOGICAL cpu ID, ie BSP == 0 */
 
 	/* initialize BSP's local APIC */
 	apic_initialize(1);
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 96c76acbd57b..049aa8323100 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.18 1997/06/22 16:03:18 peter Exp $
+ *	$Id: mp_machdep.c,v 1.19 1997/06/24 06:55:30 fsmp Exp $
  */
 
 #include "opt_smp.h"
@@ -1373,7 +1373,7 @@ start_all_aps(u_int boot_addr)
          *
          * get the initial mp_lock with a count of 1 for the BSP
          */
-	mp_lock = (lapic.id & APIC_ID_MASK) + 1;
+	mp_lock = 1;	/* this uses a LOGICAL cpu ID, ie BSP == 0 */
 
 	/* initialize BSP's local APIC */
 	apic_initialize(1);
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 96c76acbd57b..049aa8323100 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.18 1997/06/22 16:03:18 peter Exp $
+ *	$Id: mp_machdep.c,v 1.19 1997/06/24 06:55:30 fsmp Exp $
  */
 
 #include "opt_smp.h"
@@ -1373,7 +1373,7 @@ start_all_aps(u_int boot_addr)
          *
          * get the initial mp_lock with a count of 1 for the BSP
          */
-	mp_lock = (lapic.id & APIC_ID_MASK) + 1;
+	mp_lock = 1;	/* this uses a LOGICAL cpu ID, ie BSP == 0 */
 
 	/* initialize BSP's local APIC */
 	apic_initialize(1);
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 96c76acbd57b..049aa8323100 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.18 1997/06/22 16:03:18 peter Exp $
+ *	$Id: mp_machdep.c,v 1.19 1997/06/24 06:55:30 fsmp Exp $
  */
 
 #include "opt_smp.h"
@@ -1373,7 +1373,7 @@ start_all_aps(u_int boot_addr)
          *
          * get the initial mp_lock with a count of 1 for the BSP
          */
-	mp_lock = (lapic.id & APIC_ID_MASK) + 1;
+	mp_lock = 1;	/* this uses a LOGICAL cpu ID, ie BSP == 0 */
 
 	/* initialize BSP's local APIC */
 	apic_initialize(1);
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 96c76acbd57b..049aa8323100 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.18 1997/06/22 16:03:18 peter Exp $
+ *	$Id: mp_machdep.c,v 1.19 1997/06/24 06:55:30 fsmp Exp $
  */
 
 #include "opt_smp.h"
@@ -1373,7 +1373,7 @@ start_all_aps(u_int boot_addr)
          *
          * get the initial mp_lock with a count of 1 for the BSP
          */
-	mp_lock = (lapic.id & APIC_ID_MASK) + 1;
+	mp_lock = 1;	/* this uses a LOGICAL cpu ID, ie BSP == 0 */
 
 	/* initialize BSP's local APIC */
 	apic_initialize(1);
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 96c76acbd57b..049aa8323100 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.18 1997/06/22 16:03:18 peter Exp $
+ *	$Id: mp_machdep.c,v 1.19 1997/06/24 06:55:30 fsmp Exp $
  */
 
 #include "opt_smp.h"
@@ -1373,7 +1373,7 @@ start_all_aps(u_int boot_addr)
          *
          * get the initial mp_lock with a count of 1 for the BSP
          */
-	mp_lock = (lapic.id & APIC_ID_MASK) + 1;
+	mp_lock = 1;	/* this uses a LOGICAL cpu ID, ie BSP == 0 */
 
 	/* initialize BSP's local APIC */
 	apic_initialize(1);