From nobody Thu Mar 03 20:27:34 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 CB63219EBA5E; Thu, 3 Mar 2022 20:27:34 +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 4K8jGG5NTxz3LMB; Thu, 3 Mar 2022 20:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646339254; 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=lB1oBfQlx2PkYhEw12nsFOccd/NkMshkAwYqGHp4Bu4=; b=j//Wn7jZ7+veJWNzQIPC8IgX60cz3gpCqKXuWCGQxdcuQUZTgHpKiBo/kez6kabDg5+qFE T2m1DIe1+41vmizzY+kNxQ1z7EH3WWSOLfiEJrlg74x/873f2rGixYZt/DF7lQetK+p75R iUWGSi3K2MQj7okjMtHw9+vs1HKK0mvMADGJWD0y18ceV7DH0hVAob+zdefOCLDCHdzp99 OitsfBDPUvIwcrI/KhE5iAsLHUR37LXBkLKyTp9dg7EJUHVUy393rAcpkl6yDwNU7C3XLI 6T/vtjHkeUIeYkzZSvCSBDrzc2C4LTJHNh6QYyTGh0oGWWr2UYB8ZF9CIPuouA== 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 990C51E657; Thu, 3 Mar 2022 20:27:34 +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 223KRYeg086362; Thu, 3 Mar 2022 20:27:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223KRY4Q086361; Thu, 3 Mar 2022 20:27:34 GMT (envelope-from git) Date: Thu, 3 Mar 2022 20:27:34 GMT Message-Id: <202203032027.223KRY4Q086361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: d283601b80fe - main - Revert "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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d283601b80fe95dddc8b9dce7895c0fb6f19ee6a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646339254; 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=lB1oBfQlx2PkYhEw12nsFOccd/NkMshkAwYqGHp4Bu4=; b=wdO+jUyjzp0SIDyysA34bU0CVRlLzDAcc62w2QNxr6p1vAi/hJS6VcJWq0ZWjGb4YvP19Z qswJfd4xpdTKXEOJPxc3LZPYl+YyBwGkxaAITl5sRqxVxP0WAkl+8i5Gm451qH5OPkpSXU PjswyPBqsWeRncY2tA91A5ukqJavhRXrfpKrBL8vP/YxdOxPgosGrygSd72SfAXyL5dkJm Bx7PisfLDXYYIJG7KhNhvbjXtXfiGScaYnanBlIoddQQAkBVQp0H7QZv2yK3/+NXxxpSJ1 aZouYsahicQInTINbUfzOR77wMN00wTD6sCNaij5CTvLVcHjv1dTH159KDDNBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646339254; a=rsa-sha256; cv=none; b=YZnqjIycNMpw8mYhFoFLWbfSFrgiZDymXv+dgspEoOR2sxf0+6gfQr0mIUwVd0Y9rbV1ns xVAno+Z8t9XZAPOVhNsrl4aHyAaETbMC4a+qP0Zp7WUyvZ16YP4jRSm0fGawrjOhQag8BN WYLZ7kBgQTSpQLj/vze9liQSFG1ZNQK4sm26Z1ZJI6c33l+h5blVXlWiAjeYcCKlp+RVP6 n8raEktzzN0O0gWvuIc8DXiaTxS8Tb/pzZ5r0obYxtasb/MvRb2rAw7FQ45G0FmkkomjMI +ZxPB0eU1tzQUEGj5anp6gxQGrLYxSn2LpccSd+gTkF3iyGOn6DIR7ii+BJrGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d283601b80fe95dddc8b9dce7895c0fb6f19ee6a commit d283601b80fe95dddc8b9dce7895c0fb6f19ee6a Author: Mateusz Guzik AuthorDate: 2022-03-03 20:26:59 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-03 20:26:59 +0000 Revert "Expand __diagused to include the KTR kernel diagnostic option." This reverts commit 55339af296ca2a360a82e46d6699fd1b57ecf815. Induces warnings for kernels built with KTR but without debug. Discussed with: scottl --- 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 f597ae2a1f03..f2ffa7e6b815 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) || defined(KTR) +#if defined(INVARIANTS) || defined(WITNESS) #define __diagused #else #define __diagused __unused