Index: sys/kern/kern_kcov.c
===================================================================
--- sys/kern/kern_kcov.c
+++ sys/kern/kern_kcov.c
@@ -191,7 +191,7 @@
 {
 	struct thread *td;
 	struct kcov_info *info;
-	uint64_t *buf, index;
+	unsigned long *buf, index;
 
 	td = curthread;
 	info = get_kinfo(td);
@@ -207,7 +207,7 @@
 	KASSERT(info->kvaddr != 0,
 	    ("__sanitizer_cov_trace_pc: NULL buf while running"));
 
-	buf = (uint64_t *)info->kvaddr;
+	buf = (unsigned long *)info->kvaddr;
 
 	/* The first entry of the buffer holds the index */
 	index = buf[0];
Index: sys/kern/subr_coverage.c
===================================================================
--- sys/kern/subr_coverage.c
+++ sys/kern/subr_coverage.c
@@ -97,7 +97,7 @@
 
 	trace_pc = (cov_trace_pc_t)atomic_load_ptr(&cov_trace_pc);
 	if (trace_pc != NULL)
-		trace_pc((uint64_t)__builtin_return_address(0));
+		trace_pc((unsigned long)__builtin_return_address(0));
 }
 
 /*
@@ -113,7 +113,7 @@
 	trace_cmp = (cov_trace_cmp_t)atomic_load_ptr(&cov_trace_cmp);
 	if (trace_cmp != NULL)
 		trace_cmp(COV_CMP_SIZE(0), arg1, arg2,
-		    (uint64_t)__builtin_return_address(0));
+		    (unsigned long)__builtin_return_address(0));
 }
 
 void
@@ -124,7 +124,7 @@
 	trace_cmp = (cov_trace_cmp_t)atomic_load_ptr(&cov_trace_cmp);
 	if (trace_cmp != NULL)
 		trace_cmp(COV_CMP_SIZE(1), arg1, arg2,
-		    (uint64_t)__builtin_return_address(0));
+		    (unsigned long)__builtin_return_address(0));
 }
 
 void
@@ -135,7 +135,7 @@
 	trace_cmp = (cov_trace_cmp_t)atomic_load_ptr(&cov_trace_cmp);
 	if (trace_cmp != NULL)
 		trace_cmp(COV_CMP_SIZE(2), arg1, arg2,
-		    (uint64_t)__builtin_return_address(0));
+		    (unsigned long)__builtin_return_address(0));
 }
 
 void
@@ -146,7 +146,7 @@
 	trace_cmp = (cov_trace_cmp_t)atomic_load_ptr(&cov_trace_cmp);
 	if (trace_cmp != NULL)
 		trace_cmp(COV_CMP_SIZE(3), arg1, arg2,
-		    (uint64_t)__builtin_return_address(0));
+		    (unsigned long)__builtin_return_address(0));
 }
 
 void
@@ -157,7 +157,7 @@
 	trace_cmp = (cov_trace_cmp_t)atomic_load_ptr(&cov_trace_cmp);
 	if (trace_cmp != NULL)
 		trace_cmp(COV_CMP_SIZE(0) | COV_CMP_CONST, arg1, arg2,
-		    (uint64_t)__builtin_return_address(0));
+		    (unsigned long)__builtin_return_address(0));
 }
 
 void
@@ -168,7 +168,7 @@
 	trace_cmp = (cov_trace_cmp_t)atomic_load_ptr(&cov_trace_cmp);
 	if (trace_cmp != NULL)
 		trace_cmp(COV_CMP_SIZE(1) | COV_CMP_CONST, arg1, arg2,
-		    (uint64_t)__builtin_return_address(0));
+		    (unsigned long)__builtin_return_address(0));
 }
 
 void
@@ -179,7 +179,7 @@
 	trace_cmp = (cov_trace_cmp_t)atomic_load_ptr(&cov_trace_cmp);
 	if (trace_cmp != NULL)
 		trace_cmp(COV_CMP_SIZE(2) | COV_CMP_CONST, arg1, arg2,
-		    (uint64_t)__builtin_return_address(0));
+		    (unsigned long)__builtin_return_address(0));
 }
 
 void
@@ -190,7 +190,7 @@
 	trace_cmp = (cov_trace_cmp_t)atomic_load_ptr(&cov_trace_cmp);
 	if (trace_cmp != NULL)
 		trace_cmp(COV_CMP_SIZE(3) | COV_CMP_CONST, arg1, arg2,
-		    (uint64_t)__builtin_return_address(0));
+		    (unsigned long)__builtin_return_address(0));
 }
 
 /*
@@ -202,7 +202,8 @@
 void
 __sanitizer_cov_trace_switch(uint64_t val, uint64_t *cases)
 {
-	uint64_t i, count, ret, type;
+	uint64_t i, count, type;
+	unsigned long ret;
 	cov_trace_cmp_t trace_cmp;
 
 	trace_cmp = (cov_trace_cmp_t)atomic_load_ptr(&cov_trace_cmp);
@@ -210,7 +211,7 @@
 		return;
 
 	count = cases[0];
-	ret = (uint64_t)__builtin_return_address(0);
+	ret = (unsigned long)__builtin_return_address(0);
 
 	switch (cases[1]) {
 	case 8: