Remove an unused argument to turnstile_unpend.
PR: 228694 Submitted by: Julian Pszczołowski <julian.pszczolowski@gmail.com>
This commit is contained in:
parent
34c538c356
commit
d0a22279db
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=334546
@ -513,7 +513,7 @@ pmap_delayed_invl_finished(void)
|
|||||||
pmap_invl_gen = invl_gen->gen;
|
pmap_invl_gen = invl_gen->gen;
|
||||||
if (ts != NULL) {
|
if (ts != NULL) {
|
||||||
turnstile_broadcast(ts, TS_SHARED_QUEUE);
|
turnstile_broadcast(ts, TS_SHARED_QUEUE);
|
||||||
turnstile_unpend(ts, TS_SHARED_LOCK);
|
turnstile_unpend(ts);
|
||||||
}
|
}
|
||||||
turnstile_chain_unlock(&invl_gen_ts);
|
turnstile_chain_unlock(&invl_gen_ts);
|
||||||
} else {
|
} else {
|
||||||
|
@ -1029,7 +1029,7 @@ __mtx_unlock_sleep(volatile uintptr_t *c, uintptr_t v)
|
|||||||
* This turnstile is now no longer associated with the mutex. We can
|
* This turnstile is now no longer associated with the mutex. We can
|
||||||
* unlock the chain lock so a new turnstile may take it's place.
|
* unlock the chain lock so a new turnstile may take it's place.
|
||||||
*/
|
*/
|
||||||
turnstile_unpend(ts, TS_EXCLUSIVE_LOCK);
|
turnstile_unpend(ts);
|
||||||
turnstile_chain_unlock(&m->lock_object);
|
turnstile_chain_unlock(&m->lock_object);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -494,7 +494,7 @@ _rm_unlock_hard(struct thread *td,struct rm_priotracker *tracker)
|
|||||||
ts = turnstile_lookup(&rm->lock_object);
|
ts = turnstile_lookup(&rm->lock_object);
|
||||||
|
|
||||||
turnstile_signal(ts, TS_EXCLUSIVE_QUEUE);
|
turnstile_signal(ts, TS_EXCLUSIVE_QUEUE);
|
||||||
turnstile_unpend(ts, TS_EXCLUSIVE_LOCK);
|
turnstile_unpend(ts);
|
||||||
turnstile_chain_unlock(&rm->lock_object);
|
turnstile_chain_unlock(&rm->lock_object);
|
||||||
} else
|
} else
|
||||||
mtx_unlock_spin(&rm_spinlock);
|
mtx_unlock_spin(&rm_spinlock);
|
||||||
|
@ -822,7 +822,7 @@ __rw_runlock_hard(struct rwlock *rw, struct thread *td, uintptr_t v
|
|||||||
ts = turnstile_lookup(&rw->lock_object);
|
ts = turnstile_lookup(&rw->lock_object);
|
||||||
MPASS(ts != NULL);
|
MPASS(ts != NULL);
|
||||||
turnstile_broadcast(ts, queue);
|
turnstile_broadcast(ts, queue);
|
||||||
turnstile_unpend(ts, TS_SHARED_LOCK);
|
turnstile_unpend(ts);
|
||||||
td->td_rw_rlocks--;
|
td->td_rw_rlocks--;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -1259,7 +1259,7 @@ __rw_wunlock_hard(volatile uintptr_t *c, uintptr_t v LOCK_FILE_LINE_ARG_DEF)
|
|||||||
ts = turnstile_lookup(&rw->lock_object);
|
ts = turnstile_lookup(&rw->lock_object);
|
||||||
MPASS(ts != NULL);
|
MPASS(ts != NULL);
|
||||||
turnstile_broadcast(ts, queue);
|
turnstile_broadcast(ts, queue);
|
||||||
turnstile_unpend(ts, TS_EXCLUSIVE_LOCK);
|
turnstile_unpend(ts);
|
||||||
turnstile_chain_unlock(&rw->lock_object);
|
turnstile_chain_unlock(&rw->lock_object);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1405,7 +1405,7 @@ __rw_downgrade_int(struct rwlock *rw LOCK_FILE_LINE_ARG_DEF)
|
|||||||
*/
|
*/
|
||||||
if (rwait && !wwait) {
|
if (rwait && !wwait) {
|
||||||
turnstile_broadcast(ts, TS_SHARED_QUEUE);
|
turnstile_broadcast(ts, TS_SHARED_QUEUE);
|
||||||
turnstile_unpend(ts, TS_EXCLUSIVE_LOCK);
|
turnstile_unpend(ts);
|
||||||
} else
|
} else
|
||||||
turnstile_disown(ts);
|
turnstile_disown(ts);
|
||||||
turnstile_chain_unlock(&rw->lock_object);
|
turnstile_chain_unlock(&rw->lock_object);
|
||||||
|
@ -903,7 +903,7 @@ turnstile_broadcast(struct turnstile *ts, int queue)
|
|||||||
* chain locked.
|
* chain locked.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
turnstile_unpend(struct turnstile *ts, int owner_type)
|
turnstile_unpend(struct turnstile *ts)
|
||||||
{
|
{
|
||||||
TAILQ_HEAD( ,thread) pending_threads;
|
TAILQ_HEAD( ,thread) pending_threads;
|
||||||
struct turnstile *nts;
|
struct turnstile *nts;
|
||||||
|
@ -83,10 +83,6 @@ struct turnstile;
|
|||||||
#define TS_EXCLUSIVE_QUEUE 0
|
#define TS_EXCLUSIVE_QUEUE 0
|
||||||
#define TS_SHARED_QUEUE 1
|
#define TS_SHARED_QUEUE 1
|
||||||
|
|
||||||
/* The type of lock currently held. */
|
|
||||||
#define TS_EXCLUSIVE_LOCK TS_EXCLUSIVE_QUEUE
|
|
||||||
#define TS_SHARED_LOCK TS_SHARED_QUEUE
|
|
||||||
|
|
||||||
void init_turnstiles(void);
|
void init_turnstiles(void);
|
||||||
void turnstile_adjust(struct thread *, u_char);
|
void turnstile_adjust(struct thread *, u_char);
|
||||||
struct turnstile *turnstile_alloc(void);
|
struct turnstile *turnstile_alloc(void);
|
||||||
@ -102,7 +98,7 @@ struct thread *turnstile_head(struct turnstile *, int);
|
|||||||
struct turnstile *turnstile_lookup(struct lock_object *);
|
struct turnstile *turnstile_lookup(struct lock_object *);
|
||||||
int turnstile_signal(struct turnstile *, int);
|
int turnstile_signal(struct turnstile *, int);
|
||||||
struct turnstile *turnstile_trywait(struct lock_object *);
|
struct turnstile *turnstile_trywait(struct lock_object *);
|
||||||
void turnstile_unpend(struct turnstile *, int);
|
void turnstile_unpend(struct turnstile *);
|
||||||
void turnstile_wait(struct turnstile *, struct thread *, int);
|
void turnstile_wait(struct turnstile *, struct thread *, int);
|
||||||
struct thread *turnstile_lock(struct turnstile *, struct lock_object **);
|
struct thread *turnstile_lock(struct turnstile *, struct lock_object **);
|
||||||
void turnstile_unlock(struct turnstile *, struct lock_object *);
|
void turnstile_unlock(struct turnstile *, struct lock_object *);
|
||||||
|
Loading…
Reference in New Issue
Block a user