From fd8f4f3beb9a0907c0d150b13ad4f55c819a867f Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 19 Aug 2020 14:11:25 +0000
Subject: [PATCH] Mark COVERAGE and KCOV as part of KCSAN

While not strictly true this stops them from trying to use the KCSAN atomic
hooks and allows these to be compiled into the same kernel.

Sponsored by:	Innovate UK
---
 sys/kern/kern_kcov.c     | 2 ++
 sys/kern/subr_coverage.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sys/kern/kern_kcov.c b/sys/kern/kern_kcov.c
index cdf85b4c647..cedfa2c081b 100644
--- a/sys/kern/kern_kcov.c
+++ b/sys/kern/kern_kcov.c
@@ -35,6 +35,8 @@
  * $FreeBSD$
  */
 
+#define	KCSAN_RUNTIME
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/kern/subr_coverage.c b/sys/kern/subr_coverage.c
index e38f3b36e78..f3ab27c2ca3 100644
--- a/sys/kern/subr_coverage.c
+++ b/sys/kern/subr_coverage.c
@@ -35,6 +35,8 @@
  * $FreeBSD$
  */
 
+#define	KCSAN_RUNTIME
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");