Module Name: src
Committed By: riastradh
Date: Mon Aug 7 10:31:42 UTC 2023
Modified Files:
src/sys/sys: lwp.h
Log Message:
sys/lwp.h: Slightly more paranoia re curlwp in PR port-evbarm/57564.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/sys/lwp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/lwp.h
diff -u src/sys/sys/lwp.h:1.218 src/sys/sys/lwp.h:1.219
--- src/sys/sys/lwp.h:1.218 Mon Aug 7 09:41:56 2023
+++ src/sys/sys/lwp.h Mon Aug 7 10:31:42 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lwp.h,v 1.218 2023/08/07 09:41:56 riastradh Exp $ */
+/* $NetBSD: lwp.h,v 1.219 2023/08/07 10:31:42 riastradh Exp $ */
/*
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2010, 2019, 2020
@@ -539,8 +539,9 @@ CURCPU_IDLE_P(void)
static __inline void
KPREEMPT_DISABLE(lwp_t *l)
{
+ struct lwp *l1 __diagused;
- KASSERTMSG(l == curlwp, "l=%p curlwp=%p", l, curlwp);
+ KASSERTMSG(l == (l1 = curlwp), "l=%p curlwp=%p", l, l1);
l->l_nopreempt++;
__insn_barrier();
}
@@ -548,8 +549,9 @@ KPREEMPT_DISABLE(lwp_t *l)
static __inline void
KPREEMPT_ENABLE(lwp_t *l)
{
+ struct lwp *l1 __diagused;
- KASSERTMSG(l == curlwp, "l=%p curlwp=%p", l, curlwp);
+ KASSERTMSG(l == (l1 = curlwp), "l=%p curlwp=%p", l, l1);
KASSERT(l->l_nopreempt > 0);
__insn_barrier();
if (--l->l_nopreempt != 0)
