From nobody Sat Mar 04 09:12:52 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 4PTJyt4t7vz3vmxx; Sat, 4 Mar 2023 09:12:54 +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 4PTJys1Mh6z40GN; Sat, 4 Mar 2023 09:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921173; 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=rEh5LHDEar5fniuvA5qwqxj1ZXzJumQXJlcFkubhJ48=; b=tSdJ0aSJOiXMrmue1PRue0ZunChS9Irq9Fk1/GKgSs4jzN+8F/10KTjnTe2+uwYdTETwcd oy3lHbUPOLSvOcoyjNz9xbrUqqn9t0BLtfw/ZVz5mvhm5mH0GyWLP9Mwdiuu2KMdGCWoZU d5ksLIg3C6wJtqbwl35UYYENNdS9hbjCDlfFH7IAtYJMQbTdLUyBj6zGQnixSZNZFQ4cEG pAUQWtSXeCBFmtX/5tOrXfQQAv6nbzGLlqhomvHGUh9ARyGPWX5Iqcmv6RUOCHtALoMPwL +22Pw9YpFnaulABQ3RCkDOakOcwU01ShEdt9SB5ht1rXPJ/SEp0jePcUhVG9Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921173; 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=rEh5LHDEar5fniuvA5qwqxj1ZXzJumQXJlcFkubhJ48=; b=lqJfafw9tmmYbLly/efHebdqlH3T/kmwge35FLbg4TZWEEf3z2ZQbOQTtcpM+rzNyaPycD 4zqLTUSjJkbcrd2PzJKGsQMTuQ8+1d2Ke+juBVi3J48Mngqsk/925KjyE+udBpmgSBwZ/b QdluDuFMbTlT7e1B7cHz0GBXJt8CiE0RlVFocGQXL5DHM02ejNEpBy6E//+FZ5dA1wvxmk wT+lvBzh9nzLyfNtZW3anVkTvUVQ/zfnhT9xItHPcF73Io3ex8Ubi9K0tq2vDq8M0TdwYi AhB72R8pt3TrYKlOdyKj7w5bvK4dkHrqFDWznp2+R+XFm7kqbWshSJUMoGqqxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921173; a=rsa-sha256; cv=none; b=QTPOKcKxvKH4r82uuPJBhPI/ChdgAE+AwboVcq1wTLhvyErv/HgAX2itf9BJ/zLlwyuDMC uN9c4fK2lEJlHCAR/b3FM7/O66u2WSkftwA/WQouDOitJmsbEVGDIVcgOY7Z2NW2QsHi1g Qct9gPRa7yn6DNJJtRXPVXQGJdEBHjsw2Q4EnznqQ7rrYo4ae9PZ+DQ4eS+mj0Hget/jS/ EHen4FBr4adbyWlATYMeiub3AgEYmvtIl+Gar0yH77Kx8QIa/0hCSOJrs+rDAYeq4IfxeB AZKFuVD511QHSjX4Xixfx5mdzTbyYx8HlDE4uuZN7abRkqLv4l7a2/kHOvL9/A== 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 4PTJys0SyCzZJB; Sat, 4 Mar 2023 09:12:53 +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 3249CqCB079003; Sat, 4 Mar 2023 09:12:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249CqTA079002; Sat, 4 Mar 2023 09:12:52 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:52 GMT Message-Id: <202303040912.3249CqTA079002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 9883961ed5af - main - linux(4): Drop excess assert that Linux IFNAMSIZ is equal to FreeBSD 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9883961ed5af5f0ade31579e95ac53e8c514faed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=9883961ed5af5f0ade31579e95ac53e8c514faed commit 9883961ed5af5f0ade31579e95ac53e8c514faed Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:39 +0000 linux(4): Drop excess assert that Linux IFNAMSIZ is equal to FreeBSD While here use _Static_assert() instead of the older CTASSERT(). --- sys/compat/linux/linux.c | 2 +- sys/compat/linux/linux_ioctl.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 273e2a0295c1..a4df46d7f9a7 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include -CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ); +_Static_assert(LINUX_IFNAMSIZ == IFNAMSIZ, "Linux IFNAMSIZ"); static bool use_real_ifnames = false; SYSCTL_BOOL(_compat_linux, OID_AUTO, use_real_ifnames, CTLFLAG_RWTUN, diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 839c3a61d647..6d15ecdfa939 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -86,8 +86,6 @@ __FBSDID("$FreeBSD$"); #include -CTASSERT(LINUX_IFNAMSIZ == IFNAMSIZ); - #define DEFINE_LINUX_IOCTL_SET(shortname, SHORTNAME) \ static linux_ioctl_function_t linux_ioctl_ ## shortname; \ static struct linux_ioctl_handler shortname ## _handler = { \