From owner-svn-src-all@freebsd.org  Wed Aug 19 14:11:26 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA7E83BFE07;
 Wed, 19 Aug 2020 14:11:26 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BWqTB4ZjCz3cJ5;
 Wed, 19 Aug 2020 14:11:26 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 80F6423DC3;
 Wed, 19 Aug 2020 14:11:26 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07JEBQsZ086628;
 Wed, 19 Aug 2020 14:11:26 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07JEBQk6086627;
 Wed, 19 Aug 2020 14:11:26 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <202008191411.07JEBQk6086627@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 19 Aug 2020 14:11:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r364393 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: andrew
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 364393
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Aug 2020 14:11:26 -0000

Author: andrew
Date: Wed Aug 19 14:11:25 2020
New Revision: 364393
URL: https://svnweb.freebsd.org/changeset/base/364393

Log:
  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

Modified:
  head/sys/kern/kern_kcov.c
  head/sys/kern/subr_coverage.c

Modified: head/sys/kern/kern_kcov.c
==============================================================================
--- head/sys/kern/kern_kcov.c	Wed Aug 19 13:44:08 2020	(r364392)
+++ head/sys/kern/kern_kcov.c	Wed Aug 19 14:11:25 2020	(r364393)
@@ -35,6 +35,8 @@
  * $FreeBSD$
  */
 
+#define	KCSAN_RUNTIME
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 

Modified: head/sys/kern/subr_coverage.c
==============================================================================
--- head/sys/kern/subr_coverage.c	Wed Aug 19 13:44:08 2020	(r364392)
+++ head/sys/kern/subr_coverage.c	Wed Aug 19 14:11:25 2020	(r364393)
@@ -35,6 +35,8 @@
  * $FreeBSD$
  */
 
+#define	KCSAN_RUNTIME
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");