d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the ASSYM MTX_RECURSE to MTX_RECURSECNT in order to not conflict

Browse Source 
with the flag of the same name.
This commit is contained in:
Jake Burkholder 2001-01-20 06:07:36 +00:00
parent cfbe890a94
commit 7dd2de5bc2
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/cpu_switch.S
View File

@ -133,7 +133,7 @@ ENTRY(cpu_switch)
1: 1:
/* save sched_lock recursion count */ /* save sched_lock recursion count */
movl _sched_lock+MTX_RECURSE,%eax movl _sched_lock+MTX_RECURSECNT,%eax
movl %eax,PCB_SCHEDNEST(%edx) movl %eax,PCB_SCHEDNEST(%edx)
#ifdef SMP #ifdef SMP
@ -313,7 +313,7 @@ cpu_switch_load_gs:
* new process * new process
*/ */
movl PCB_SCHEDNEST(%edx),%eax movl PCB_SCHEDNEST(%edx),%eax
movl %eax,_sched_lock+MTX_RECURSE movl %eax,_sched_lock+MTX_RECURSECNT
movl PCPU(CURPROC),%eax movl PCPU(CURPROC),%eax
movl %eax,_sched_lock+MTX_LOCK movl %eax,_sched_lock+MTX_LOCK

2
sys/amd64/amd64/genassym.c
View File

@ -229,5 +229,5 @@ ASSYM(GPROC0_SEL, GPROC0_SEL);
ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame)); ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame));
ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); 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)); ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr));

4
sys/amd64/amd64/swtch.s
View File

@ -133,7 +133,7 @@ ENTRY(cpu_switch)
1: 1:
/* save sched_lock recursion count */ /* save sched_lock recursion count */
movl _sched_lock+MTX_RECURSE,%eax movl _sched_lock+MTX_RECURSECNT,%eax
movl %eax,PCB_SCHEDNEST(%edx) movl %eax,PCB_SCHEDNEST(%edx)
#ifdef SMP #ifdef SMP
@ -313,7 +313,7 @@ cpu_switch_load_gs:
* new process * new process
*/ */
movl PCB_SCHEDNEST(%edx),%eax movl PCB_SCHEDNEST(%edx),%eax
movl %eax,_sched_lock+MTX_RECURSE movl %eax,_sched_lock+MTX_RECURSECNT
movl PCPU(CURPROC),%eax movl PCPU(CURPROC),%eax
movl %eax,_sched_lock+MTX_LOCK movl %eax,_sched_lock+MTX_LOCK

2
sys/i386/i386/genassym.c
View File

@ -229,5 +229,5 @@ ASSYM(GPROC0_SEL, GPROC0_SEL);
ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame)); ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame));
ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); 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)); ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr));

4
sys/i386/i386/swtch.s
View File

@ -133,7 +133,7 @@ ENTRY(cpu_switch)
1: 1:
/* save sched_lock recursion count */ /* save sched_lock recursion count */
movl _sched_lock+MTX_RECURSE,%eax movl _sched_lock+MTX_RECURSECNT,%eax
movl %eax,PCB_SCHEDNEST(%edx) movl %eax,PCB_SCHEDNEST(%edx)
#ifdef SMP #ifdef SMP
@ -313,7 +313,7 @@ cpu_switch_load_gs:
* new process * new process
*/ */
movl PCB_SCHEDNEST(%edx),%eax movl PCB_SCHEDNEST(%edx),%eax
movl %eax,_sched_lock+MTX_RECURSE movl %eax,_sched_lock+MTX_RECURSECNT
movl PCPU(CURPROC),%eax movl PCPU(CURPROC),%eax
movl %eax,_sched_lock+MTX_LOCK movl %eax,_sched_lock+MTX_LOCK