diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c
--- a/sys/kern/subr_intr.c
+++ b/sys/kern/subr_intr.c
@@ -143,7 +143,7 @@
 #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_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 @@
 
 /* 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
--- a/sys/sys/intr.h
+++ b/sys/sys/intr.h
@@ -165,6 +165,6 @@
 
 #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 */