From nobody Thu Feb 10 15:16:57 2022 X-Original-To: dev-commits-src-branches@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 EF78D19C328F; Thu, 10 Feb 2022 15:16:58 +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 4JvgMZ0yVgz3jZ0; Thu, 10 Feb 2022 15:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644506218; 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=HcgKKsAIPyRR5y8TgLEuomkGM8NcizmrECc77ierppE=; b=adciQRiA7i5ld7IjVwWdlQuZZjAkOv8F7BkDudlwAXZpXPoiecDpAR9loAt5761mBM5W8T cozP8NCPxQ4HfHSPUMQAFjhhAgiIkIw6HWF8v6qk8sRN+k3MgAyzxiCUHhJOmkyFIy6OmD mcEJykYSsaAW4HzuhZJ4ctJPB27xL3JQYBKtgRcyCbWZUhEpp0qqBwMdDH3W6Rqs34uCat yUr1QiNZ9Qxk6YNneA/ubqMKBmjAQMi7vnju8XdorqFsSuMwqSpgI1q6Ua7PJRP6XDfHc0 ZzZA1/bNcIz46eTYPHbz58Dllf3bJ6XHSXh7ATZ5S/YOuzruotZeWscxIFkT7Q== 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 A968F22CFA; Thu, 10 Feb 2022 15:16:57 +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 21AFGvHV071385; Thu, 10 Feb 2022 15:16:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AFGv4U071384; Thu, 10 Feb 2022 15:16:57 GMT (envelope-from git) Date: Thu, 10 Feb 2022 15:16:57 GMT Message-Id: <202202101516.21AFGv4U071384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: e01be53158bd - stable/13 - mbuf(9): Properly declare some function macros when debugging is disabled. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e01be53158bd51cbb7776f56832b0fd74a50fd42 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644506218; 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=HcgKKsAIPyRR5y8TgLEuomkGM8NcizmrECc77ierppE=; b=PtsSUvAJFDxkuPwtoRKujAiasTotZFAGwg4MaHE16il4wRVvlWTNs4uEDF4QFrtYRzgah5 3nM/o+MFiJOg4GzE+H4ou/iawFG751OawfKPgrD2w+zQw8vFTW0VGOB57p/SGuIXsb/HZz psdMNXzvJ86K2Nphpz3Bk2wDZt/C8/C5g7q9/ryPiAX4Nh24JBYVx8kPRTabwo9uJCBbMi GPOjFcnZ+YN1aRV0FUR1fFHAUike/3XQrFbsCP9icNKS4PPAsLqM+acNvUwcLyFKCogHXy wj8I4fwGWd6euOXc+sCbKllX0SirBCb4Cm6gjtv18pno+kzKCfcrhhtFrXRJ0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644506218; a=rsa-sha256; cv=none; b=x0pakYfo/YvzAqsNOqlHSW5yR6OufL4U/22YWN9Oqnq6DO+9Tof0SE+hNp6FtbBuRAA6FK qcy9Kfd4rjRl9E+4nufnwpfVjvIH6NEG5rRj7tLBSFzmSo/tDXSzgZW1sSALoHLX0w2XF1 sb53OEAyz513o7Iw4kB8pKGmngcy9g3fSmLEYcY0tCYMamK5reFlRUcWEnTBIQojlwYUIo 2QwteiaUteFdH5CSsm6XwtUlFj9YBursX1PHv2hVm8aTXhVjaeEbv+/jO0o9xRjmkge+yX H58haY9KGyN7Tzjr4wfBxP1c0KXnoXTdlyJmJRbmOdhnsoH2hkqA29t40RiFGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=e01be53158bd51cbb7776f56832b0fd74a50fd42 commit e01be53158bd51cbb7776f56832b0fd74a50fd42 Author: Hans Petter Selasky AuthorDate: 2022-01-26 11:00:12 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-10 15:11:11 +0000 mbuf(9): Properly declare some function macros when debugging is disabled. No functional change intended. Sponsored by: NVIDIA Networking (cherry picked from commit a6d45243233ccd26940df7fed127357cdc2d6b75) --- sys/sys/mbuf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index a6376784a85f..dac06069c65a 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -440,7 +440,7 @@ m_epg_pagelen(const struct mbuf *m, int pidx, int pgoff) "too large header length"); \ } while (0) #else -#define MBUF_EXT_PGS_ASSERT_SANITY(m) do {} while (0); +#define MBUF_EXT_PGS_ASSERT_SANITY(m) do {} while (0) #endif #endif @@ -779,7 +779,7 @@ union if_snd_tag_alloc_params; "Sleeping in \"%s\"", __func__); \ } while (0) #else -#define MBUF_CHECKSLEEP(how) +#define MBUF_CHECKSLEEP(how) do {} while (0) #endif /* @@ -1131,7 +1131,7 @@ m_extrefcnt(struct mbuf *m) ("%s: chain %p contains an unmapped mbuf", __func__, (m)));\ } while (0) #else -#define M_ASSERTMAPPED(m) +#define M_ASSERTMAPPED(m) do {} while (0) #endif /*