diff options
| author | Jake Burkholder <jake@FreeBSD.org> | 2001-01-10 04:43:51 +0000 |
|---|---|---|
| committer | Jake Burkholder <jake@FreeBSD.org> | 2001-01-10 04:43:51 +0000 |
| commit | ef73ae4b0ccbd4beded1e8cce7f528799a1ae5ed (patch) | |
| tree | 837f127fd047b38a9231fd849a9c2619fd965f3d /sys/kern/kern_mutex.c | |
| parent | 64ca32560de33b7d9e93ef9a226362c7dd105101 (diff) | |
Notes
Diffstat (limited to 'sys/kern/kern_mutex.c')
| -rw-r--r-- | sys/kern/kern_mutex.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 77fbdc1e527f..a79299caf901 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -844,7 +844,7 @@ witness_enter(struct mtx *m, int flags, const char *file, int line) if (m->mtx_recurse != 0) return; mtx_enter(&w_mtx, MTX_SPIN | MTX_QUIET); - i = witness_spin_check; + i = PCPU_GET(witness_spin_check); if (i != 0 && w->w_level < i) { mtx_exit(&w_mtx, MTX_SPIN | MTX_QUIET); panic("mutex_enter(%s:%x, MTX_SPIN) out of order @" @@ -977,7 +977,8 @@ witness_exit(struct mtx *m, int flags, const char *file, int line) if (m->mtx_recurse != 0) return; mtx_enter(&w_mtx, MTX_SPIN | MTX_QUIET); - PCPU_SET(witness_spin_check, witness_spin_check & ~w->w_level); + PCPU_SET(witness_spin_check, + PCPU_GET(witness_spin_check) & ~w->w_level); mtx_exit(&w_mtx, MTX_SPIN | MTX_QUIET); return; } @@ -1011,7 +1012,8 @@ witness_try_enter(struct mtx *m, int flags, const char *file, int line) if (m->mtx_recurse != 0) return; mtx_enter(&w_mtx, MTX_SPIN | MTX_QUIET); - PCPU_SET(witness_spin_check, witness_spin_check | w->w_level); + PCPU_SET(witness_spin_check, + PCPU_GET(witness_spin_check) | w->w_level); mtx_exit(&w_mtx, MTX_SPIN | MTX_QUIET); w->w_file = file; w->w_line = line; |