From nobody Tue Nov 05 04:24:01 2024 X-Original-To: dev-commits-src-all@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 4XjFb56Yklz5d02n; Tue, 05 Nov 2024 04:24:01 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjFb54tP2z4Jsv; Tue, 5 Nov 2024 04:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780641; 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=DIilAXrN5q4yiPPHIPk2qnRa4dsI3yz/TCUDq/P2UbY=; b=h8Vo1exzjB2Tmien8Mw4AoSx2Ees2mhQcJMJwIE7oe7oHoc99Qx10xJiN735dxe8GKF7IN w6twk4jNsEF/H+CkUp3hx7uLG5dPlnbwXP0bBuMpIcb89k+6HmUJN6/nhXOh7uk2foX6RE b1eILUNYd3728xQoV/+iLgidr0pJf1luOx3Q3eooCu3OgQhOVA9qeia5uHzWLleVlIrU1d MWRuqxuk9nRfstdU1QxkPcwxQ98CgOFbbQS6dJcJeTdhZCxnkohy2GnXkIKXqiKNi+S627 KauHV4P/ursTTu100g4LmsU6vKzoKJVhtG0MZEyMk0WYEF3FiwATWGCtA5ECGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780641; 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=DIilAXrN5q4yiPPHIPk2qnRa4dsI3yz/TCUDq/P2UbY=; b=QC1aqeJDDim4wYIZW9F+yul3YuC9ZhHXK27UFepRQJbIXwtS5DarOsmLzMkQqLWOqN3wMF xOfB39Xw4qiUVa40l6eVLcrcnImi76KnJRBhpPzdv0iFfukt4XU+jY1NLKcFg+ODu02t2i SH5bCinLWTQanMQ4uf+RyBHkKKniSRH3OvyyabMyTsQv01uI/b7HzzMX+k95MsgFydSre8 wTjG2rZcJAByriAPazTH0eMwCWUG7JVasUK3dCGXsZUiqDJh7X8ZwoeazFNmut4QAbGDD1 R/JolkqqQeflFDOMgRYLvWxBA/1UM9JyTnieig8ipTjOCkML8qPR9dyuSiZ2TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780641; a=rsa-sha256; cv=none; b=DoXP/v7nvbv2ev2io+1xqKukrWK5AAzOrfkcmuphwLPIJyuTQ+4+kV2q7wcaSWg6pccPfw 37PSeCKZ3qaSPCSCuqeOX7v9VyIosrK3y/lQeOAE0VxjsjPcVSYcgwCL3Eu8vjioDkNjwk XPRUaRxxnYi3Hti7eP7UGD+/2LekdPcoh0T5yX/GR/9Mob5Yfnbpnvc0UgKQoBSR9Crxhq OJ748IYBuRnVDgofKQxuMsjxLftmFSviQ0xFmxfapP4hoLOxZ/YvqXMT9FuGSrrMVHDFmD 8zL0VrkItKrZzNxs0mwfpA00gVO3iVOUw/1zjEua0ZwpWmM17JZxV5kFVUdcwA== 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 4XjFb54QqNz12sv; Tue, 5 Nov 2024 04:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A54O1uh066899; Tue, 5 Nov 2024 04:24:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54O1uV066896; Tue, 5 Nov 2024 04:24:01 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:24:01 GMT Message-Id: <202411050424.4A54O1uV066896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 55c854cf0c6a - main - refcount: Avoid redefining KASSERT for userspace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55c854cf0c6aacb60ed88c02522377b1b3fa134d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=55c854cf0c6aacb60ed88c02522377b1b3fa134d commit 55c854cf0c6aacb60ed88c02522377b1b3fa134d Author: Mark Johnston AuthorDate: 2024-11-05 03:40:02 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 04:23:49 +0000 refcount: Avoid redefining KASSERT for userspace Just bring in systm.h unconditionally. Otherwise this definition of KASSERT conflicts with the one from kassert.h, specifically when including other headers which unconditionally include systm.h or kassert.h. A number of other kernel headers depend on this pollution, but ideally we'd only need kassert.h here. Reported by: Jenkins MFC after: 1 week --- sys/sys/refcount.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/sys/refcount.h b/sys/sys/refcount.h index 212e8e516271..44588fe3c812 100644 --- a/sys/sys/refcount.h +++ b/sys/sys/refcount.h @@ -30,11 +30,9 @@ #include -#if defined(_KERNEL) || defined(_STANDALONE) #include -#else +#if !defined(_KERNEL) && !defined(_STANDALONE) #include -#define KASSERT(exp, msg) /* */ #endif #define REFCOUNT_SATURATED(val) (((val) & (1U << 31)) != 0)