diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 28027501688e..06d65488c470 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -1994,7 +1994,6 @@ start_all_aps(u_int boot_addr)
 		/* prime data page for it to use */
 		SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
 		gd->gd_cpuid = x;
-		gd->gd_cpu_lockid = x << 24;
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 28027501688e..06d65488c470 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -1994,7 +1994,6 @@ start_all_aps(u_int boot_addr)
 		/* prime data page for it to use */
 		SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
 		gd->gd_cpuid = x;
-		gd->gd_cpu_lockid = x << 24;
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 28027501688e..06d65488c470 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -1994,7 +1994,6 @@ start_all_aps(u_int boot_addr)
 		/* prime data page for it to use */
 		SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
 		gd->gd_cpuid = x;
-		gd->gd_cpu_lockid = x << 24;
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 28027501688e..06d65488c470 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -1994,7 +1994,6 @@ start_all_aps(u_int boot_addr)
 		/* prime data page for it to use */
 		SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
 		gd->gd_cpuid = x;
-		gd->gd_cpu_lockid = x << 24;
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 28027501688e..06d65488c470 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -1994,7 +1994,6 @@ start_all_aps(u_int boot_addr)
 		/* prime data page for it to use */
 		SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
 		gd->gd_cpuid = x;
-		gd->gd_cpu_lockid = x << 24;
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 28027501688e..06d65488c470 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -1994,7 +1994,6 @@ start_all_aps(u_int boot_addr)
 		/* prime data page for it to use */
 		SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
 		gd->gd_cpuid = x;
-		gd->gd_cpu_lockid = x << 24;
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 28027501688e..06d65488c470 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -1994,7 +1994,6 @@ start_all_aps(u_int boot_addr)
 		/* prime data page for it to use */
 		SLIST_INSERT_HEAD(&cpuhead, gd, gd_allcpu);
 		gd->gd_cpuid = x;
-		gd->gd_cpu_lockid = x << 24;
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;