aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Mitchell <ehem+freebsd@m5p.com>2021-05-03 16:50:17 +0000
committerMark Johnston <markj@FreeBSD.org>2021-05-03 17:24:30 +0000
commita3c7da3d08eec921f16a32c4c716b896385264e9 (patch)
tree9f8b2e8b40b91d79c293d615a602e5bdd9353d78
parent1d712c05370dca8cbf81d1ecd9acd606fdcacaf4 (diff)
downloadsrc-a3c7da3d08eec921f16a32c4c716b896385264e9.tar.gz
src-a3c7da3d08eec921f16a32c4c716b896385264e9.zip
kern/intr: declare interrupt vectors unsigned
These should never get values large enough for sign to matter, but one of them becoming negative could cause problems. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D29327
-rw-r--r--sys/kern/subr_intr.c8
-rw-r--r--sys/sys/intr.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c
index 7f99d194e971..df6bf9e63ba0 100644
--- a/sys/kern/subr_intr.c
+++ b/sys/kern/subr_intr.c
@@ -143,7 +143,7 @@ static bool irq_assign_cpu = false;
#endif
#endif
-int intr_nirq = NIRQ;
+u_int intr_nirq = NIRQ;
SYSCTL_UINT(_machdep, OID_AUTO, nirq, CTLFLAG_RDTUN, &intr_nirq, 0,
"Number of IRQs");
@@ -166,7 +166,7 @@ static void intr_map_copy_map_data(u_int res_id, device_t *dev, intptr_t *xref,
static void
intr_irq_init(void *dummy __unused)
{
- int intrcnt_count;
+ u_int intrcnt_count;
SLIST_INIT(&pic_list);
mtx_init(&pic_list_lock, "intr pic list", NULL, MTX_DEF);
@@ -1576,8 +1576,8 @@ struct intr_map_entry
/* XXX Convert irq_map[] to dynamicaly expandable one. */
static struct intr_map_entry **irq_map;
-static int irq_map_count;
-static int irq_map_first_free_idx;
+static u_int irq_map_count;
+static u_int irq_map_first_free_idx;
static struct mtx irq_map_lock;
static struct intr_irqsrc *
diff --git a/sys/sys/intr.h b/sys/sys/intr.h
index c922b10f3368..b373a6f23bf0 100644
--- a/sys/sys/intr.h
+++ b/sys/sys/intr.h
@@ -165,6 +165,6 @@ u_long * intr_ipi_setup_counters(const char *name);
#endif
-extern int intr_nirq; /* number of IRQs on intrng platforms */
+extern u_int intr_nirq; /* number of IRQs on intrng platforms */
#endif /* _SYS_INTR_H */