sync with OpenBSD -current

This commit is contained in:
purplerain 2024-07-04 01:05:14 +00:00
parent 0c5463838b
commit ff77f1c0ed
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
8 changed files with 50 additions and 42 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: kern_lock.c,v 1.74 2024/05/29 18:55:45 claudio Exp $ */
/* $OpenBSD: kern_lock.c,v 1.75 2024/07/03 01:36:50 jsg Exp $ */
/*
* Copyright (c) 2017 Visa Hankala
@ -194,30 +194,6 @@ __mp_release_all(struct __mp_lock *mpl)
return (rv);
}
int
__mp_release_all_but_one(struct __mp_lock *mpl)
{
struct __mp_lock_cpu *cpu = &mpl->mpl_cpus[cpu_number()];
int rv = cpu->mplc_depth - 1;
#ifdef WITNESS
int i;
for (i = 0; i < rv; i++)
WITNESS_UNLOCK(&mpl->mpl_lock_obj, LOP_EXCLUSIVE);
#endif
#ifdef MP_LOCKDEBUG
if (!__mp_lock_held(mpl, curcpu())) {
db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
db_enter();
}
#endif
cpu->mplc_depth = 1;
return (rv);
}
void
__mp_acquire_count(struct __mp_lock *mpl, int count)
{