Module Name: src
Committed By: riastradh
Date: Fri Jun 23 22:49:38 UTC 2023
Modified Files:
src/sys/kern: kern_synch.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.355 -r1.356 src/sys/kern/kern_synch.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_synch.c
diff -u src/sys/kern/kern_synch.c:1.355 src/sys/kern/kern_synch.c:1.356
--- src/sys/kern/kern_synch.c:1.355 Fri Jun 23 21:19:03 2023
+++ src/sys/kern/kern_synch.c Fri Jun 23 22:49:38 2023
@@ -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);
