From nobody Wed Apr 29 21:43:10 2026 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 4g5W4t4x5pz6c1FB for ; Wed, 29 Apr 2026 21:43:10 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5W4t2Qrzz3hJP for ; Wed, 29 Apr 2026 21:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777498990; 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=57Fxsv3/70paipsezVy6wkjN3dNhJFcu6xfTXejzHNw=; b=dxrMhQTEINsGYKxtbqAQ0JUMw4mC3FdN1M0tJuGYOC3A6wFRdMYvQdGGlV0Ljo7vA0dc33 thVgkRKNMdEWDRSHUg1iCzuvizmsgtPyzPr2WHW2JoeLJHNqaYj63vSjoHao6iXYpSKIeN ZtSm+8mUbzTneXmBCAK5lCq2EBeAXZX03XVWbOViG3g77dp+3MmjK2Ke1+iduOq6CYW0om zIZKfCJdpvsRCtHqr/2f4ZC7OJJI5Fh76UFeEkgeE2xDgsldz7PFId9MmQj0fplfFiM5Gb yz2NVfMIM/VJ9I/4ZuAtitaOmvWpqb2QClPoMrC+6iTBEOHyN77Ad7O1ubdAcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777498990; a=rsa-sha256; cv=none; b=eD5JQ+WeO01gVGgGUOK3mHUcNKBCjkfYjq3YoXe4aINf6zOQN03dAmwG4JfgHesaPDcs4m O5dW11VLZRTX2YuyC1S0p/ke7MTBQYmhWk1Vwkv1tb5w1l3AeypHNVl1Zh0gzNmu8AAf32 E8PyQUnWHCkYGV13fau123LWMpIhjLJ3wTmU72BWaIpSyM8XGcSxKBtpd9sxBh0So9MzcM o/KmZtyFEapw30rgqKRs4c86Sc/QnvPnBQqppg7ZjuKRC+zRd+FPdyH/7T2XemYonBYQkC qNZp8Q6H7Dn2hAxYOceuRfugzMqkgVZcxxyfoOp6xF0jlP7NxgCYdOm/IfZ0hg== 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=1777498990; 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=57Fxsv3/70paipsezVy6wkjN3dNhJFcu6xfTXejzHNw=; b=DcITk5UC8fCyXLkM2svr/pHu/x94dm2pB5HhMTuZMzvritwlJQWl+ysxB8OfIAbdww/M6R 9FX5kSBYCzoyORZBPMyzzIoN/x+Kf/V5BJZv5tMHZybPJEZGCW4IPfApNy9ixsi0+iCSHr 6o2tRV3S8In9s8TEhxaxZuq/OTFDR+b3JD7zoEs+UhN1iIaSk+rjTMFURwn6okD4ncz679 tbir6M6tQhVUJwVdDkttOv8M4zaoeViPWjfTO4y94mppulD/Tat/a50QN4X3bGal6atiLV B64CQYIZI3041d7zBW/ykAdHjQevy4lteG27t4+LVJeRpuP1pkxT494q4xud/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5W4t1q1kzypd for ; Wed, 29 Apr 2026 21:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46ff6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 21:43:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: dd7e503a181a - stable/15 - linuxkpi: Move `ARRAY_SIZE` to 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dd7e503a181a590db6ddef1e6aabeae62e248d40 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 21:43:10 +0000 Message-Id: <69f27b6e.46ff6.48632780@gitrepo.freebsd.org> The branch stable/15 has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=dd7e503a181a590db6ddef1e6aabeae62e248d40 commit dd7e503a181a590db6ddef1e6aabeae62e248d40 Author: Jean-Sébastien Pédron AuthorDate: 2026-04-20 21:34:08 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-29 21:04:15 +0000 linuxkpi: Move `ARRAY_SIZE` to The DRM generic code started to import this header directly in Linux 6.12.x. Let's move the definition of `ARRAY_SIZE()` (the only thing that defines) to this header. Also, include from the same headers as Linux. This includes , so the change should not break anything. Reviewed by: bz Sponsored by: The FreeBSD Foundation (cherry picked from commit 1c641d0436e377c57a767e37f56ce65253817d67) --- sys/compat/linuxkpi/common/include/linux/array_size.h | 17 +++++++++++++++++ sys/compat/linuxkpi/common/include/linux/kernel.h | 3 +-- sys/compat/linuxkpi/common/include/linux/kfifo.h | 1 + sys/compat/linuxkpi/common/include/linux/string.h | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/array_size.h b/sys/compat/linuxkpi/common/include/linux/array_size.h new file mode 100644 index 000000000000..ebfaeccc9536 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/array_size.h @@ -0,0 +1,17 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * All rights reserved. + */ + +#ifndef _LINUXKPI_LINUX_ARRAY_SIZE_H_ +#define _LINUXKPI_LINUX_ARRAY_SIZE_H_ + +#include + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +#endif /* _LINUXKPI_LINUX_ARRAY_SIZE_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 8caaf520fd3e..afbd9208a410 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -266,8 +267,6 @@ extern int linuxkpi_debug; }) #endif -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - #define u64_to_user_ptr(val) ((void *)(uintptr_t)(val)) #define offsetofend(t, m) \ diff --git a/sys/compat/linuxkpi/common/include/linux/kfifo.h b/sys/compat/linuxkpi/common/include/linux/kfifo.h index b0d0c17f07e4..c8cea1226b3c 100644 --- a/sys/compat/linuxkpi/common/include/linux/kfifo.h +++ b/sys/compat/linuxkpi/common/include/linux/kfifo.h @@ -30,6 +30,7 @@ #include +#include #include #include diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index ad2b2fe7d377..ba6549804edc 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -31,6 +31,7 @@ #include +#include #include #include #include