Module Name: src
Committed By: ad
Date: Mon Dec 9 21:02:10 UTC 2019
Modified Files:
src/sys/kern: kern_rwlock.c
Log Message:
Expunge the panicstr checks, we don't need them.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/kern/kern_rwlock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_rwlock.c
diff -u src/sys/kern/kern_rwlock.c:1.58 src/sys/kern/kern_rwlock.c:1.59
--- src/sys/kern/kern_rwlock.c:1.58 Sat Nov 30 14:21:16 2019
+++ src/sys/kern/kern_rwlock.c Mon Dec 9 21:02:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rwlock.c,v 1.58 2019/11/30 14:21:16 ad Exp $ */
+/* $NetBSD: kern_rwlock.c,v 1.59 2019/12/09 21:02:10 ad Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.58 2019/11/30 14:21:16 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.59 2019/12/09 21:02:10 ad Exp $");
#define __RWLOCK_PRIVATE
@@ -357,10 +357,6 @@ rw_vector_enter(krwlock_t *rw, const krw
owner = next;
continue;
}
- if (__predict_false(panicstr != NULL)) {
- KPREEMPT_ENABLE(curlwp);
- return;
- }
if (__predict_false(RW_OWNER(rw) == curthread)) {
rw_abort(__func__, __LINE__, rw,
"locking against myself");
@@ -450,9 +446,6 @@ rw_vector_exit(krwlock_t *rw)
curthread = (uintptr_t)curlwp;
RW_ASSERT(rw, curthread != 0);
- if (__predict_false(panicstr != NULL))
- return;
-
/*
* Again, we use a trick. Since we used an add operation to
* set the required lock bits, we can use a subtract to clear
@@ -729,8 +722,6 @@ rw_read_held(krwlock_t *rw)
{
uintptr_t owner;
- if (panicstr != NULL)
- return 1;
if (rw == NULL)
return 0;
owner = rw->rw_owner;
@@ -748,8 +739,6 @@ int
rw_write_held(krwlock_t *rw)
{
- if (panicstr != NULL)
- return 1;
if (rw == NULL)
return 0;
return (rw->rw_owner & (RW_WRITE_LOCKED | RW_THREAD)) ==
@@ -767,8 +756,6 @@ int
rw_lock_held(krwlock_t *rw)
{
- if (panicstr != NULL)
- return 1;
if (rw == NULL)
return 0;
return (rw->rw_owner & RW_THREAD) != 0;
