Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern tsleep: Comment out kernel lock assertion for now.



details:   https://anonhg.NetBSD.org/src/rev/e8ba82bca8e5
branches:  trunk
changeset: 376602:e8ba82bca8e5
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jun 23 22:49:38 2023 +0000

description:
tsleep: Comment out kernel lock assertion for now.

Breaks tpm(4) which breaks boot on a lot of systems.  tpm(4)
shouldn't be using tsleep; it doesn't appear to even have an
interrupt handler for wakeups, so it could get by with kpause.  If it
ever did sprout an interrupt handler it should use condvar(9) anyway.
But for now I don't have time to fix it tonight.

diffstat:

 sys/kern/kern_synch.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 9c9d51159987 -r e8ba82bca8e5 sys/kern/kern_synch.c
--- a/sys/kern/kern_synch.c     Fri Jun 23 21:19:03 2023 +0000
+++ b/sys/kern/kern_synch.c     Fri Jun 23 22:49:38 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_synch.c,v 1.355 2023/06/23 21:19:03 riastradh Exp $       */
+/*     $NetBSD: kern_synch.c,v 1.356 2023/06/23 22:49:38 riastradh Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2019, 2020
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.355 2023/06/23 21:19:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.356 2023/06/23 22:49:38 riastradh Exp $");
 
 #include "opt_kstack.h"
 #include "opt_dtrace.h"
@@ -178,7 +178,7 @@ tsleep(wchan_t ident, pri_t priority, co
 
        KASSERT((l->l_pflag & LP_INTR) == 0);
        KASSERT(ident != &lbolt);
-       KASSERT(KERNEL_LOCKED_P());
+       //KASSERT(KERNEL_LOCKED_P());
 
        if (sleepq_dontsleep(l)) {
                (void)sleepq_abort(NULL, 0);



Home | Main Index | Thread Index | Old Index