diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 98bca90889c..6d255df12e7 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -133,7 +133,7 @@ ENTRY(cpu_switch)
 1:
  
 	/* save sched_lock recursion count */
-	movl	_sched_lock+MTX_RECURSE,%eax
+	movl	_sched_lock+MTX_RECURSECNT,%eax
 	movl    %eax,PCB_SCHEDNEST(%edx)
  
 #ifdef SMP
@@ -313,7 +313,7 @@ cpu_switch_load_gs:
 	 * new process
 	 */
 	movl	PCB_SCHEDNEST(%edx),%eax
-	movl	%eax,_sched_lock+MTX_RECURSE
+	movl	%eax,_sched_lock+MTX_RECURSECNT
 
 	movl	PCPU(CURPROC),%eax
 	movl	%eax,_sched_lock+MTX_LOCK
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index eca44e0a619..00fd68d5253 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -229,5 +229,5 @@ ASSYM(GPROC0_SEL, GPROC0_SEL);
 ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame));
 
 ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock));
-ASSYM(MTX_RECURSE, offsetof(struct mtx, mtx_recurse));
+ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse));
 ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr));
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index 98bca90889c..6d255df12e7 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -133,7 +133,7 @@ ENTRY(cpu_switch)
 1:
  
 	/* save sched_lock recursion count */
-	movl	_sched_lock+MTX_RECURSE,%eax
+	movl	_sched_lock+MTX_RECURSECNT,%eax
 	movl    %eax,PCB_SCHEDNEST(%edx)
  
 #ifdef SMP
@@ -313,7 +313,7 @@ cpu_switch_load_gs:
 	 * new process
 	 */
 	movl	PCB_SCHEDNEST(%edx),%eax
-	movl	%eax,_sched_lock+MTX_RECURSE
+	movl	%eax,_sched_lock+MTX_RECURSECNT
 
 	movl	PCPU(CURPROC),%eax
 	movl	%eax,_sched_lock+MTX_LOCK
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index eca44e0a619..00fd68d5253 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -229,5 +229,5 @@ ASSYM(GPROC0_SEL, GPROC0_SEL);
 ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame));
 
 ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock));
-ASSYM(MTX_RECURSE, offsetof(struct mtx, mtx_recurse));
+ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse));
 ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr));
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index 98bca90889c..6d255df12e7 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -133,7 +133,7 @@ ENTRY(cpu_switch)
 1:
  
 	/* save sched_lock recursion count */
-	movl	_sched_lock+MTX_RECURSE,%eax
+	movl	_sched_lock+MTX_RECURSECNT,%eax
 	movl    %eax,PCB_SCHEDNEST(%edx)
  
 #ifdef SMP
@@ -313,7 +313,7 @@ cpu_switch_load_gs:
 	 * new process
 	 */
 	movl	PCB_SCHEDNEST(%edx),%eax
-	movl	%eax,_sched_lock+MTX_RECURSE
+	movl	%eax,_sched_lock+MTX_RECURSECNT
 
 	movl	PCPU(CURPROC),%eax
 	movl	%eax,_sched_lock+MTX_LOCK