diff options
| author | jake <jake@FreeBSD.org> | 2001-01-20 06:07:36 +0000 |
|---|---|---|
| committer | jake <jake@FreeBSD.org> | 2001-01-20 06:07:36 +0000 |
| commit | 19d6e5bb42dd780ccdc64b7aefdcba086e5376ec (patch) | |
| tree | 0199f2f94e67e4b459be81825869085f446c8eef /sys/i386 | |
| parent | 33aed99e3f536c4fa8350864ed155272114bb9b6 (diff) | |
| download | FreeBSD-src-19d6e5bb42dd780ccdc64b7aefdcba086e5376ec.zip FreeBSD-src-19d6e5bb42dd780ccdc64b7aefdcba086e5376ec.tar.gz | |
Rename the ASSYM MTX_RECURSE to MTX_RECURSECNT in order to not conflict
with the flag of the same name.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/genassym.c | 2 | ||||
| -rw-r--r-- | sys/i386/i386/swtch.s | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index eca44e0..00fd68d 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 98bca90..6d255df 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 |
