From nobody Mon Apr 15 19:32:33 2024 X-Original-To: dev-commits-src-main@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 4VJHPY39Dxz5HBXf; Mon, 15 Apr 2024 19:32:33 +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 4VJHPY2cSQz4PjQ; Mon, 15 Apr 2024 19:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713209553; 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=ghONVKf/GE6U5Yao4ayI50aZcMvQnhZEYgQQhQHog6w=; b=j/89B+FpFhjOUCKQio/2wIGrFKAqjUWvRnAk63RIW7rK2PsyV1RbuJEZZPbl/t1ISnCu7K enVZ5XF/CGmMtEl9MOaUBu7ziFzNwwRFAwY7Fa418ftQBiMam5S2hQccLa2k1au85Kl37s h5ffTSvL5yif+QmPlDrchPHWEE1SgBl+Ta27pnVWT8FqHQBQowRuOmpy8J33+/f8ZzCjD2 gw6PPGgN+wZgjNtpRaSi7TDt3PfnbTTWrAkR7xfdELky2RH4gcipCE075KINTS7azN7aQt oX/dkuTl+EkDQr9HHG4014/DrLWzHqEnG1aH82KeHxYZMw3faGIjHK+0vtw2qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713209553; a=rsa-sha256; cv=none; b=FRFXnS1mN5tFvThKWkdHVuN0foHhyIoYL84xd9BIIeV/CQGswsSEbUOwqlPfcRZZfuhO7G 4t4lGEaSY70I7bc/mzA4DN2fuQkuJCTIx/mRTkZrjE0toYjE/Qlld+5JTf8nEeHXWtqYrW JEWgTLX8R/C7rD9OkpQXvFDtxbWenMiZwEuxT6U0033HLkL1YBf0biZPDR3f2el058utYN CJwy3vuuvMOou9FBn7ia78fOoQE2F3y2JEcr5vQfLoRVzFepS9wrsQe75nlLg6pixN53J5 FKDx0YIGv4NVcpUrFKKAKsM9wAAXqrHwONr/VuzLKtDaHbxhTUBOWBZRwrklRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713209553; 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=ghONVKf/GE6U5Yao4ayI50aZcMvQnhZEYgQQhQHog6w=; b=O5ex0DqDUTRYrqwuV2bqmpMtU1LOMHzq3HV/KidMbqDYDhtJO/nQs5V+QVjypR34Src2hG jqgWIhxdQzkfriiQCf80U4niz8AnaGc4oJ0LyK5eycoKA86PX1Jl9764q/ltT03TwO4StB gsg9Cb7Wil9AplHifoVXgw+lO/EQXT/Bb28h6nztX66JuuNLclrMR9JQjjNGhn1VEaBEcM GHn4HFdk3/HF/F0ep0PauRHIeY5eXo00UGbjlVh4TL37Q2c3ZMhYM5t4OZr312aL104Cc7 5dm7q0GwwNw86aFvvlYWbrpZ/uNZ0hw6GGB79a64lN6VvmvzoJQTXHZHoNJ+CQ== 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 4VJHPY2Ckkz1B5s; Mon, 15 Apr 2024 19:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43FJWXbo027311; Mon, 15 Apr 2024 19:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FJWXsd027308; Mon, 15 Apr 2024 19:32:33 GMT (envelope-from git) Date: Mon, 15 Apr 2024 19:32:33 GMT Message-Id: <202404151932.43FJWXsd027308@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2a8c50592f7f - main - LinuxKPI: add __counted_by() and __nonstring List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a8c50592f7fce8bceedf004f674a5a9eae0fd46 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2a8c50592f7fce8bceedf004f674a5a9eae0fd46 commit 2a8c50592f7fce8bceedf004f674a5a9eae0fd46 Author: Bjoern A. Zeeb AuthorDate: 2024-04-02 09:41:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-15 19:31:49 +0000 LinuxKPI: add __counted_by() and __nonstring Add checks for __counted_by(_x) and __nonstring as and depending on compiler support enable the attribute/feature. This is needed to make mtk76 and ath1xk drivers compile. Sposnored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste, dim Differential Revision: https://reviews.freebsd.org/D44587 --- sys/compat/linuxkpi/common/include/linux/compiler.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index 1ae41d9ba641..d59e6faed12d 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -67,6 +67,17 @@ #define ____cacheline_aligned_in_smp __aligned(CACHE_LINE_SIZE) #define fallthrough /* FALLTHROUGH */ do { } while(0) +#if __has_attribute(__nonstring__) +#define __nonstring __attribute__((__nonstring__)) +#else +#define __nonstring +#endif +#if __has_attribute(__counted_by__) +#define __counted_by(_x) __attribute__((__counted_by__(_x))) +#else +#define __counted_by(_x) +#endif + #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) #define typeof(x) __typeof(x)