Zap last remaining references to (and a use use of) of simple_locks.

This commit is contained in:
peter 2001-01-31 04:29:52 +00:00
parent ee1ef07885
commit 6150a50174
4 changed files with 1 additions and 16 deletions

View File

@ -137,7 +137,7 @@ hpfs_hphashvget(dev, ino, p)
if (ino == hp->h_no && dev == hp->h_dev) {
vp = HPTOV(hp);
mtx_enter(&vp->v_interlock, MTX_DEF);
simple_unlock (&hpfs_hphash_slock);
mtx_exit(&hpfs_hphash_mtx, MTX_DEF);
if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, p))
goto loop;
return (vp);

View File

@ -61,16 +61,6 @@
#define PUSHDOWN_LEVEL_1
#define PUSHDOWN_LEVEL_2
/*
* Debug version of simple_lock. This will store the CPU id of the
* holding CPU along with the lock. When a CPU fails to get the lock
* it compares its own id to the holder id. If they are the same it
* panic()s, as simple locks are binary, and this would cause a deadlock.
*
*/
#define SL_DEBUG
/*
* Put FAST_INTR() ISRs at an APIC priority above the regular INTs.
* Allow the mp_lock() routines to handle FAST interrupts while spinning.

View File

@ -917,10 +917,6 @@ mi_switch()
mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED);
#ifdef SIMPLELOCK_DEBUG
if (p->p_simple_locks)
printf("sleep: holding simple lock\n");
#endif
/*
* Compute the amount of time during which the current
* process was running, and add that to its total so far.

View File

@ -222,7 +222,6 @@ struct proc {
char p_rqindex; /* (j) Run queue index. */
short p_locks; /* (*) DEBUG: lockmgr count of held locks */
short p_simple_locks; /* (*) DEBUG: count of held simple locks */
u_int p_stops; /* (c) Procfs event bitmask. */
u_int p_stype; /* (c) Procfs stop event type. */
char p_step; /* (c) Procfs stop *once* flag. */