From nobody Wed Mar 22 22:28:46 2023 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 4Phjmt744Mz41P0p; Wed, 22 Mar 2023 22:28:46 +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 4Phjmt6MTNz3jQh; Wed, 22 Mar 2023 22:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524126; 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=MO9FkqJd3Fqx4EyffKLbAFDvBefnr/y2cYtQQSuw/LA=; b=nlj9WZmMwlmi1lAadT/eyIRELKFZDzgl/Avb4HSxgMTI6jO5kKmwyr7SkZUW4PtgtZfl7J NEHWq0bzDoF/4rgKae0FqvK0JtY5V0NC3iJMzr5pGyf6Ya8H5DCFNb7m980mYhECNjNQlv 6XwnPTsUurA0IEugAP2ExB7f96NHUYRLCBsQedptiecZkeD74Rz/j0F4y/c/Vica3IFYHV 2M9N4XkbrnOZQEAg6CF2JA7elSd+X/9ELKjHiFrmqNIYUhX3Vf1mne6BOjsu7XhBPy+cfQ M9PIbPnuFoY+Ehey1z2d4DQYw2zs6V/fYM69DNlAuoJP/IprBNQXs6xIPd5/AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524126; 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=MO9FkqJd3Fqx4EyffKLbAFDvBefnr/y2cYtQQSuw/LA=; b=U1V+8ljQm+hjpLAfJIgMkGULLn6i1HASjwFQkLOD4B28eerll2vXCI5O7tecWiJDup+XZe N9XBpOFvX7w3pgYPh0xKXhvJdrezntAuYeio1Sr3Hj1TqOe5qW8Q5o6EHXvyF7dHAuATDw uyu3FM5De5nSVL5/ocT9Q81K0/s9KG0v1KKK0satxAvs65SWNOze1NHEK4MRhVMg4bKK1n IttO23btwBtzH3FFyAeXdGJu+i+XkS1W/2n+xHHxn0H8p/ACX+ChPmi9AIBFLqpRcvmrii rwR3pgF9eIcIxlJMJJLm17peMR5xZ/7u67O+3j0L6xpXen1N4GDgrq6GjNbpmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524126; a=rsa-sha256; cv=none; b=A0giOAxKBFbzY8jVQHC/GAk3SyOvwXIWcXKdoNXxEdsSMS24C2hXPpINyIpFCp0IVYH9Ua 0pPGj1T9FnpthwGmkN7yp20ETLSS94+dPCGy4rbIinVoq2+QJHnPuDqMn6X/eiDBa1RWxa GsPcmjxRpH6fLUo6Lxlsz6RA+n+By58XvJYCdJGjdaZdIG+0iCQ0BfuKnvuoqvb/mOGt6p pGIJWHAbR1uVmPVMgbvg6vRwdCUo2fQ6NeXVBgiB9AGxnb+MJClET4dkv/FjoIikusv0It 7ob2uStD39uGSlsrSG1VBb0AoW14dzlHbxDfjV8cYlMbu1H28j5pUvD9aC3dFQ== 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 4Phjmt4Q5Kz1BRm; Wed, 22 Mar 2023 22:28:46 +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 32MMSku1001980; Wed, 22 Mar 2023 22:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSkHk001979; Wed, 22 Mar 2023 22:28:46 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:46 GMT Message-Id: <202303222228.32MMSkHk001979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8f88432a1de0 - stable/12 - ofed: quiet gcc -Wint-in-bool-context 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8f88432a1de012706ca04113b05600724fb71a5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8f88432a1de012706ca04113b05600724fb71a5f commit 8f88432a1de012706ca04113b05600724fb71a5f Author: Ryan Libby AuthorDate: 2021-02-24 23:56:16 +0000 Commit: John Baldwin CommitDate: 2023-03-22 22:27:09 +0000 ofed: quiet gcc -Wint-in-bool-context The int in the argument to the ternary triggered -Wint-in-bool-context from gcc. Upstream linux has a larger and more entangled patch, 12f727721eee61b3d19dedb95cb893b2baa9fe41, which doesn't apply cleanly. When we eventually sync that, we can just drop this change. Reviewed by: hselasky, imp, kib MFC after: 3 days Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D28762 (cherry picked from commit bf667f282a7b98e7456d11e1cb46d9707ab8e774) --- sys/ofed/drivers/infiniband/core/uverbs.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/ofed/drivers/infiniband/core/uverbs.h b/sys/ofed/drivers/infiniband/core/uverbs.h index 6c8d9632b0dc..0db0d47cc691 100644 --- a/sys/ofed/drivers/infiniband/core/uverbs.h +++ b/sys/ofed/drivers/infiniband/core/uverbs.h @@ -64,8 +64,10 @@ #define INIT_UDATA_BUF_OR_NULL(udata, ibuf, obuf, ilen, olen) \ do { \ - (udata)->inbuf = (ilen) ? (const void __user *) (ibuf) : NULL; \ - (udata)->outbuf = (olen) ? (void __user *) (obuf) : NULL; \ + (udata)->inbuf = ((ilen) != 0) ? \ + (const void __user *) (ibuf) : NULL; \ + (udata)->outbuf = ((olen) != 0) ? \ + (void __user *) (obuf) : NULL; \ (udata)->inlen = (ilen); \ (udata)->outlen = (olen); \ } while (0)