Page MenuHomeFreeBSD

D47342.diff
No OneTemporary

D47342.diff

diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -1054,7 +1054,7 @@
_mtx_release_lock_quick(m);
ts = turnstile_lookup(&m->lock_object);
if (__predict_false(ts == NULL)) {
- panic("got NULL turnstile on mutex %p v %zx", m, v);
+ panic("got NULL turnstile on mutex %p v %p", m, (void *)v);
}
if (LOCK_LOG_TEST(&m->lock_object, opts))
CTR1(KTR_LOCK, "_mtx_unlock_sleep: %p contested", m);
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -829,8 +829,8 @@
*/
ts = turnstile_lookup(&rw->lock_object);
if (__predict_false(ts == NULL)) {
- panic("got NULL turnstile on rwlock %p passedv %zx v %zx",
- rw, passedv, v);
+ panic("got NULL turnstile on rwlock %p passedv %p v %p",
+ rw, (void *)passedv, (void *)v);
}
turnstile_broadcast(ts, queue);
turnstile_unpend(ts);
@@ -1274,8 +1274,8 @@
ts = turnstile_lookup(&rw->lock_object);
if (__predict_false(ts == NULL)) {
- panic("got NULL turnstile on rwlock %p passedv %zx v %zx", rw,
- passedv, v);
+ panic("got NULL turnstile on rwlock %p passedv %p v %p", rw,
+ (void *)passedv, (void *)v);
}
turnstile_broadcast(ts, queue);
turnstile_unpend(ts);

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 8, 4:31 AM (22 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14500355
Default Alt Text
D47342.diff (1 KB)

Event Timeline