From nobody Sat May 7 15:57:14 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 339721AC48C8; Sat, 7 May 2022 15:57:15 +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 4KwXBL2jHrz4R8T; Sat, 7 May 2022 15:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651939035; 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=acGZSUYIdJ6bkvdV0n4jqSVv/DbrjMhtg8Td8GIiaec=; b=oP5wcLTDvEU+olLJMVT1ERaLjK46c2X/2WxlB42t0WbjOahhsYvE12hOzTJPJQal+ZB1HH aUfcF2wL5Q8JjpoLlmAKq559c5cPwOiktV199YvXRfFLTmUyY5Ocs3tgbNC+ycVEubjgGv c4Cc6x5UXicgL981MCwgVUfLCeHW+uf7i08LyxKKkIEJoEAJP7Zf7cvjoWUbHqxpuQHDyT +XaxZ6E9F/B+k1S5qXgPC0v+UWzNlvhJtqn8HZOSVX2ODBllMVcbNZCzpKglSNpwe5A9/o 5dPq3sC+SfUwPWt/GgedisYJr7WIxZjcoYk6p6TIefwcoyZvKsG76H/B9EBAvg== 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 3721B13739; Sat, 7 May 2022 15:57:14 +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 247FvEq5015036; Sat, 7 May 2022 15:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 247FvEdu015035; Sat, 7 May 2022 15:57:14 GMT (envelope-from git) Date: Sat, 7 May 2022 15:57:14 GMT Message-Id: <202205071557.247FvEdu015035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alex Richardson Subject: git: 763198cc5086 - stable/13 - linuxkpi: Allow BUILD_BUG_ON in if statements without braces 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: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 763198cc50865e419efca0060f4620b601786929 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651939035; 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=acGZSUYIdJ6bkvdV0n4jqSVv/DbrjMhtg8Td8GIiaec=; b=wgkIZo88vXkyuy8+hOMt3KZT22kTZNTpD3cwk3I2b3BHWKW00md5OYCPmAXz2cBrHYqhoQ LYfna0d8Y1vOq1xxKDOq551WqwUUpefhCPEzMt+vJBzWf40KCpGdbIRIn07fRHgQOuHa15 90b3Hvbv0xbiv7TE2A2EgK5CrECuik0bIsLPm8uvEPpXobkCWx2C8sYwW+Lw2MSw6BX+XM nPJNBoXtswtZ7bWpD40ueO0pCuIbdtbkZF1OKasb507x5RmOWYpFzNCBE8XV//re063gb5 uz1QWByqFmufSQgSGNX3dmSY2Sxx176gxQ2K7pqTUsvvFMvPOTI5qfGNMgkahQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651939035; a=rsa-sha256; cv=none; b=pBhtOk2SECQSRdASqOWdNSqWkSvyqcvffreXPFUtpXozu8cQ8nn5WIC3o3jkT4m7kNlkvI 6y1CLeP7DXABrmpqzNDSFg6LNt3Bkc8cG+s5Ao7kJHrAOkoa63imAwmTYG9aPlzFqTBDAA 71Fh0RyPqx+gw69QmPVSaGZJ22vPKKho4E5cFWuHHU8YsCvJBVzFiWBrVvKI24VsvxvAe7 tfh0DCG0wFTgP8e9AJVMuDxp5fHAxlQD1Lf2kF1LXffxQ2cOUivKzSWjkccxbXlzCW1rPF 3InTvkzR+lqtCkEFOYA9IILZiMaNgCFq3/cK2ehmAp5ZpEoVjA9+jnls2mKtwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=763198cc50865e419efca0060f4620b601786929 commit 763198cc50865e419efca0060f4620b601786929 Author: Alex Richardson AuthorDate: 2021-10-08 08:35:31 +0000 Commit: Alex Richardson CommitDate: 2022-05-07 12:08:46 +0000 linuxkpi: Allow BUILD_BUG_ON in if statements without braces I got a compilation failure in virtio-gpu without this change. Reviewed By: #linuxkpi, manu, bz, hselasky Differential Revision: https://reviews.freebsd.org/D32366 (cherry picked from commit 6d15ccde4d9579ad2a77f93630695804a7efcbc4) --- sys/compat/linuxkpi/common/include/linux/kernel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index c22a711a4f47..51f2ffe01e15 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -105,7 +105,7 @@ } #define BUILD_BUG() do { CTASSERT(0); } while (0) -#define BUILD_BUG_ON(x) _O_CTASSERT(!(x)) +#define BUILD_BUG_ON(x) do { _O_CTASSERT(!(x)) } while (0) #define BUILD_BUG_ON_MSG(x, msg) BUILD_BUG_ON(x) #define BUILD_BUG_ON_NOT_POWER_OF_2(x) BUILD_BUG_ON(!powerof2(x)) #define BUILD_BUG_ON_INVALID(expr) while (0) { (void)(expr); }