diff options
| author | jhb <jhb@FreeBSD.org> | 2001-03-28 02:46:21 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-03-28 02:46:21 +0000 |
| commit | dea228e37800fc07cb4619f31e155310a4bad233 (patch) | |
| tree | 736b7978158917eb079abef53bb1666484a42676 | |
| parent | 98391b90da348c14bd0bd9487e807b726f734789 (diff) | |
| download | FreeBSD-src-dea228e37800fc07cb4619f31e155310a4bad233.zip FreeBSD-src-dea228e37800fc07cb4619f31e155310a4bad233.tar.gz | |
Catch up to the mtx_saveintr -> mtx_savecrit change.
| -rw-r--r-- | sys/amd64/amd64/genassym.c | 2 | ||||
| -rw-r--r-- | sys/i386/i386/genassym.c | 2 | ||||
| -rw-r--r-- | sys/ia64/ia64/genassym.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_intr.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 44c91b6..fac7049 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -204,4 +204,4 @@ ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame)); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse)); -ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr)); +ASSYM(MTX_SAVECRIT, offsetof(struct mtx, mtx_savecrit)); diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index 44c91b6..fac7049 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -204,4 +204,4 @@ ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame)); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse)); -ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr)); +ASSYM(MTX_SAVECRIT, offsetof(struct mtx, mtx_savecrit)); diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c index 058700d..cf96eff 100644 --- a/sys/ia64/ia64/genassym.c +++ b/sys/ia64/ia64/genassym.c @@ -73,7 +73,7 @@ ASSYM(GD_CPUID, offsetof(struct globaldata, gd_cpuid)); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSE, offsetof(struct mtx, mtx_recurse)); -ASSYM(MTX_SAVEINTR, offsetof(struct mtx, mtx_saveintr)); +ASSYM(MTX_SAVECRIT, offsetof(struct mtx, mtx_savecrit)); ASSYM(MTX_UNOWNED, MTX_UNOWNED); ASSYM(P_ADDR, offsetof(struct proc, p_addr)); diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index ad64715..0113967 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -333,7 +333,7 @@ ithread_schedule(struct ithd *ithread, int do_switch) { struct int_entropy entropy; struct proc *p; - intrmask_t saveintr; + critical_t savecrit; /* * If no ithread or no handlers, then we have a stray interrupt. @@ -372,13 +372,13 @@ ithread_schedule(struct ithd *ithread, int do_switch) p->p_stat = SRUN; setrunqueue(p); if (do_switch && curproc->p_stat == SRUN) { - saveintr = sched_lock.mtx_saveintr; + savecrit = sched_lock.mtx_savecrit; mtx_intr_enable(&sched_lock); if (curproc != PCPU_GET(idleproc)) setrunqueue(curproc); curproc->p_stats->p_ru.ru_nvcsw++; mi_switch(); - sched_lock.mtx_saveintr = saveintr; + sched_lock.mtx_savecrit = savecrit; } else need_resched(); } else { |
