From nobody Tue Oct 18 15:36:55 2022 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 4MsHzC5H6dz4g4Jn; Tue, 18 Oct 2022 15:36:55 +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 4MsHzC4sWwz3V4Y; Tue, 18 Oct 2022 15:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666107415; 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=7Gn+TAJQ9cOLmcWpKR3O2+EduxlX/eBQcrf5XHsmRSU=; b=RXssgyn7LXoOa6W8TSwyQyCCaEZjdyjmclOpgPVI8aS2Bqk0IhFpefIgXjJHwFeeXCxTYL bn3xX55uxmR9rBHNkZKFDg5SrUf2g2ZTXvLrPPjWNxpFUIL6+YaNyCblrKRJlgIM325TCs 9cRSomb8OmE3Ie6xWWnvingYU9hnAvNDPNHIiHlnZ+QarBJbQTsYwBZ/u4w9kE/qLfi1yp odfdSk+rliRd7D4yqnOrjmy+KdRsk77KtuH3MPGj63jX1MkO9rOerK6ctdful5PGB6EXK5 KuPHG6ENgJu2NAvX/pxLH21pDGgiHGX/90G6aSOmDChw2TKuE2WVvW34qSTdWQ== 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 4MsHzC3dsDz1CqW; Tue, 18 Oct 2022 15:36:55 +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 29IFatYA004598; Tue, 18 Oct 2022 15:36:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29IFatJi004597; Tue, 18 Oct 2022 15:36:55 GMT (envelope-from git) Date: Tue, 18 Oct 2022 15:36:55 GMT Message-Id: <202210181536.29IFatJi004597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e03b7883e97c - main - mbuf: don't include lock.h conditionally 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e03b7883e97cd1ff9b963eea401c7f4819328f71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666107415; 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=7Gn+TAJQ9cOLmcWpKR3O2+EduxlX/eBQcrf5XHsmRSU=; b=Oczm4tf6HiM5FX0Vf0BNxbmJ5kArFMxZkyKG3ztGjBESXiVGmWjMdRO0gZZmOVfwK0Zbuj w9G2ODpYK72Q4O5g9iBT5cycceoh5JX+2apISreYJAaeieTeDZsqjrMks2uUEQa7BEq55I 5Y9gBhAmjRjvPIOXKPxNEAJ/McLrLUzLprRjN79i9LXkriT+ja6R3aXtJP9/YoZAlx/slB 4tXBJ1dRAOn6wn2xkYJKvSYkRa3GxomIDPzNGu6PA9vFoggl3b+YMJiDJYMWJ/gELdoQgd QtecZfADX9rejs2H9E+3XJK72bq+M6vZUtiRENK33J9cICp8kW1r7sY/JI+F6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666107415; a=rsa-sha256; cv=none; b=j1L7y6Ez2vlGLHHsZhiq0M+OFUeW8rs/snrflPisJSsGNgO2hb3gw4wrisn7vkC3Bk/nXc q/GwQy8YDJ6rd2u5ZxZdyxSKKZ7MF+tw443OGPpvhqwABJUWdZg17o/MsELMvVqwIakgB6 szEHAOK66giJoLZ+F06s2fgp3dlup0xExtEN+PLnT5I4nqizS+bAkMlSQCCxvMQQLlohC7 jdkRKHkFHjYjJ3HrQEbB/oFBD7KUucWkP9m+icyF3CwpynHp2BtIiGTSt2w4W1WSgZA+xZ HhSIAVGGNeWiWG34cMTj9gQAcOwPeRAEBtwezgsljfZqWjisGWm+Jj0DP/i8eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e03b7883e97cd1ff9b963eea401c7f4819328f71 commit e03b7883e97cd1ff9b963eea401c7f4819328f71 Author: Gleb Smirnoff AuthorDate: 2022-10-18 15:34:03 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-18 15:34:03 +0000 mbuf: don't include lock.h conditionally Using keywords from opt_global.h in the system headers allows to create cryptic kernel build failures, that depend on the options used in the kernel config, very hard to debug and understand. Fixes: 063d8114650c025240604b5c6df9358355fc98f4 --- sys/sys/mbuf.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 97bfd56536e0..a6a28291123d 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -42,12 +42,7 @@ #include #include #include -#ifdef WITNESS -#include -#endif -#endif -#ifdef _KERNEL #include #define MBUF_PROBE1(probe, arg0) \ @@ -791,15 +786,11 @@ m_epg_pagelen(const struct mbuf *m, int pidx, int pgoff) #ifdef _KERNEL union if_snd_tag_alloc_params; -#ifdef WITNESS #define MBUF_CHECKSLEEP(how) do { \ if (how == M_WAITOK) \ WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, \ "Sleeping in \"%s\"", __func__); \ } while (0) -#else -#define MBUF_CHECKSLEEP(how) do {} while (0) -#endif /* * Network buffer allocation API