From nobody Sat Feb 26 18:02:51 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D49B619E3A12; Sat, 26 Feb 2022 18:02:51 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K5ZHb5Yb9z3vwm; Sat, 26 Feb 2022 18:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645898571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FM2SXBMzHvnIup3fORLUwhIObSTy0G/MFvOw5iTxr8U=; b=sTzaHKavT3TfvCmdgqhAgOhxtBZLYPZhCFtWAa6E7F0xmMihFXDbfjZVVH5Uqu2Q3oSSHF PgNrGCg7kjlCEJJNqqaoMclRMBnBgDBn53Bia/b6/dNk84N3GUboMoiMq4OHgt8FaL5gNO BewAM1XOAZEOOUVb/FgNZ8VJNyYaZp+2TcAoYSds6fDFk0bphNHBhniz5foqFrYMwcI947 3xl5jW4x5qe927bwIK6/YK6bt6xwmIoPgE8tkrS5wkKALZjF60X1EPnFYLkrFxq7Bx9Bs5 9Qo/FsePBlX8wlSW2HG3ykHLWdhNH8WI94lPzbD7pg9GmBqezhTDiu8qYKG91w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9FE1C185F3; Sat, 26 Feb 2022 18:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21QI2pxH013511; Sat, 26 Feb 2022 18:02:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21QI2p5r013510; Sat, 26 Feb 2022 18:02:51 GMT (envelope-from git) Date: Sat, 26 Feb 2022 18:02:51 GMT Message-Id: <202202261802.21QI2p5r013510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Scott Long Subject: git: 55339af296ca - main - Expand __diagused to include the KTR kernel diagnostic option. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: scottl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55339af296ca2a360a82e46d6699fd1b57ecf815 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645898571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FM2SXBMzHvnIup3fORLUwhIObSTy0G/MFvOw5iTxr8U=; b=Fvic7Vdy+YY+KcT84ipyRN2w+dr7ldaTN2zWQJZrc6G5f2c1muzAxvdsg3XrHfK+fgoI9T p9L90MUEEfdh+EaErcpKxCXRCpcgMkwf98eP8eDefoEmHdIT/sSV9B4cxk97DfjJQvMFDB 3w3dge0TOihh48i2C4ioLnBxO97VMm0As+yV0bHKOFK19NxVtHwafIhsdj9LArY2PQZVUm LkdwFzPXZyaN3LjXzmzN67XFxNAvAzeT5axqOclLrsfF4Kd53v//XPU0GG+ugDBVprARmj L4jtzUuP1ZHYYr7qAQtU0j5pimzy6amaa9btFhEqAAX5TJ13hniXWH9xcz3KSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645898571; a=rsa-sha256; cv=none; b=s5eJtkwzRvR/4/I8t8WRZ4EBBox9BEs3IeBsL4k48wFpzU9tI+TlZtsC1net0rh8hHRPQj JrJRYFBT/jRsnMqmDSSJsaRZyFlsIot0YX/cu3mHbbWAHE0SxHJsDHD+dFyHuojCWOZ0Il gULYkzwylsCBGeqmK+3Q3ft8IP82FiPhWkNlfjC6a7KKJ27iICEz2Vc6tAIGu8sIUcY1vH RVu87BnFbXyIt+TvwhVu8gslK+7lLMhP7m/b0a1kkuHYbubSAAt/i9nLN0vKkjsV0Xb5Na bPshHoQQvCbQt07B6PIKUfAm7aeeF+1DLkMzqBw30Tp+rwvru3xaAJISmcFR8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by scottl: URL: https://cgit.FreeBSD.org/src/commit/?id=55339af296ca2a360a82e46d6699fd1b57ecf815 commit 55339af296ca2a360a82e46d6699fd1b57ecf815 Author: Scott Long AuthorDate: 2022-02-26 18:01:54 +0000 Commit: Scott Long CommitDate: 2022-02-26 18:01:54 +0000 Expand __diagused to include the KTR kernel diagnostic option. --- sys/sys/systm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/systm.h b/sys/sys/systm.h index f2ffa7e6b815..f597ae2a1f03 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -554,7 +554,7 @@ void _gone_in_dev(device_t dev, int major, const char *msg); #define gone_in(major, msg) __gone_ok(major, msg) _gone_in(major, msg) #define gone_in_dev(dev, major, msg) __gone_ok(major, msg) _gone_in_dev(dev, major, msg) -#if defined(INVARIANTS) || defined(WITNESS) +#if defined(INVARIANTS) || defined(WITNESS) || defined(KTR) #define __diagused #else #define __diagused __unused