Module Name: src
Committed By: riastradh
Date: Thu Oct 5 12:30:59 UTC 2023
Modified Files:
src/sys/arch/arm/cortex: gic.c
Log Message:
arm/gic: Check l_blcnt, not l_biglocks.
l_biglocks is a now-defunct temporary storage used only when
sleeping; l_blcnt is the number of kernel locks held by the lwp when
not sleeping.
Should fix arm builds.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/arm/cortex/gic.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/arch/arm/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.56 src/sys/arch/arm/cortex/gic.c:1.57
--- src/sys/arch/arm/cortex/gic.c:1.56 Sun Jun 26 11:14:36 2022
+++ src/sys/arch/arm/cortex/gic.c Thu Oct 5 12:30:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.56 2022/06/26 11:14:36 jmcneill Exp $ */
+/* $NetBSD: gic.c,v 1.57 2023/10/05 12:30:59 riastradh Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.56 2022/06/26 11:14:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.57 2023/10/05 12:30:59 riastradh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -320,7 +320,7 @@ armgic_irq_handler(void *tf)
struct armgic_softc * const sc = &armgic_softc;
const int old_ipl = ci->ci_cpl;
const int old_mtx_count = ci->ci_mtx_count;
- const int old_l_biglocks = ci->ci_curlwp->l_biglocks;
+ const int old_l_blcnt = ci->ci_curlwp->l_blcnt;
#ifdef DEBUG
size_t n = 0;
#endif
@@ -407,7 +407,7 @@ armgic_irq_handler(void *tf)
pic_do_pending_ints(I32_bit, old_ipl, tf);
KASSERTMSG(ci->ci_cpl == old_ipl, "ci_cpl %d old_ipl %d", ci->ci_cpl, old_ipl);
KASSERT(old_mtx_count == ci->ci_mtx_count);
- KASSERT(old_l_biglocks == ci->ci_curlwp->l_biglocks);
+ KASSERT(old_l_blcnt == ci->ci_curlwp->l_blcnt);
}
void
