From nobody Tue Sep 15 07:57:20 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 4hkZ9x4p5Kz6rXPx for ; Tue, 15 Sep 2026 07:57:25 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hkZ9x4F8Qz4Rxh for ; Tue, 15 Sep 2026 07:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789459045; 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=KwsFfPrYFKWtUeTOvImVNweOpJSR7USC7IjoZ6NboMg=; b=S69dx/4eNCnhIJki123mi16YHC+7cOMAA4oIdUtzDhvddEZoP/bJzLsthMhVjVm7xTiY9Q mUgn16XL9p1kpb1A5nCy5xUUBLE1qi8cUOK1QmKMOJRH7JODdu86P4t2S1nQ/9TJEIJwK+ tsmgbOTpY9RjH6h/17xN12XS36rOl05F4RUyjUrhPCzGj7Uds3IPxi8W+h8GCrbrlKuukK BJz779qcmqEmVS+sp4ZhCS8ecBP2reCL2fABW8n6fflRL41ntjmtOqPEQM9BV7Dfhj6tXq 8h6TTAwSgKwmwlxzyO3J29J6GzOp4GXKL6V7OEBPhPTUFqVzI+lHIDEkNI4lKQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789459045; b=rmlIPoqPEdbQjGL9OCbzgE4FUiTCYgQohl8tTecylmjWbcTtSeJ38RPMA0baMV3LRQuVVc VjPc8y4C6AxCV+Zv9G1PDQOFIz3j+owuF1W6k+C9c9ki5IbhlX5/LkvLun4Y1GkKHPymag Ki1rzxVsa6CCtSGFmZI6WXXmY6kINjaT42o70ABTCXQ53spH1XngYbTn56JSY/2GZHXOZc /vN7Iw5SGXSEcPi3AsI8TfeciRwvD5NNIpZhGV10fa91NJORjCXa9PLL9HQq/7BcZEWU4q Fa8O2RD10QOR2LGKVwRxNPWOcSlf5ecL7/DaiLKUjBmLiKEMuDVYEh6EnCvzDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789459045; 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=KwsFfPrYFKWtUeTOvImVNweOpJSR7USC7IjoZ6NboMg=; b=PRY7G+yVaM4egAZ1Y6O5hxWb/7riWPjgNC0huVSeRPT2etmoVlvo5YzKjDNHZ64xZmofpE l1E7ssXJCdxu375vvdLM7l+qSbhGQ8jsVatxnCi3WmiTxegjucE07jSDImHOUdwDEuEhEz rC2ngc/+IyTj6U/kyXdR2tW+4uSit9r2q9l+z0Z7n6XSFzhz9+6tMJAJ8HHtJ4VVUHVpjk fM1yLwjlcdN3rMWHepYAynWjuMcQU8TQoLa1q6iQic/2LjrR3pL0mFXSz1kyYjvRQh+xm+ 5IdOeZDi7f1aHlpiOZuLv8StFAfQW1VOjLpUaRIKI9o9EohV/eiFyxrSJDOQuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hkZ9x31nczrfm for ; Tue, 15 Sep 2026 07:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 324da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 15 Sep 2026 07:57:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 5407f767db14 - main - linuxkpi: Compile `x86_match_cpu()` on amd64 and i386 only 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 5407f767db14a76bb63b5a8b3f77da6085d149c5 Auto-Submitted: auto-generated Date: Tue, 15 Sep 2026 07:57:20 +0000 Message-Id: <6aa8fa60.324da.468016a2@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=5407f767db14a76bb63b5a8b3f77da6085d149c5 commit 5407f767db14a76bb63b5a8b3f77da6085d149c5 Author: Jean-Sébastien Pédron AuthorDate: 2026-09-14 20:37:55 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-09-15 07:55:35 +0000 linuxkpi: Compile `x86_match_cpu()` on amd64 and i386 only This fixes the build on other architectures where `struct x86_cpu_id` is unavailable. Sponsored by: The FreeBSD Foundation --- sys/compat/linuxkpi/common/include/asm/cpu_device_id.h | 2 ++ sys/compat/linuxkpi/common/src/linux_compat.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/asm/cpu_device_id.h b/sys/compat/linuxkpi/common/include/asm/cpu_device_id.h index 5741cddd52b1..890038ba742a 100644 --- a/sys/compat/linuxkpi/common/include/asm/cpu_device_id.h +++ b/sys/compat/linuxkpi/common/include/asm/cpu_device_id.h @@ -52,7 +52,9 @@ X86_STEPPING_ANY, \ X86_FEATURE_ANY) +#if defined(__i386__) || defined(__amd64__) const struct x86_cpu_id *linuxkpi_x86_match_cpu(const struct x86_cpu_id *match_array); #define x86_match_cpu(match_array) linuxkpi_x86_match_cpu(match_array) +#endif #endif /* _LINUXKPI_ASM_CPU_DEVICE_ID_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 3cdeb8e2d297..84f95b3ec317 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -3087,6 +3087,7 @@ linux_compat_uninit(void *arg) } SYSUNINIT(linux_compat, SI_SUB_DRIVERS, SI_ORDER_SECOND, linux_compat_uninit, NULL); +#if defined(__i386__) || defined(__amd64__) const struct x86_cpu_id * linuxkpi_x86_match_cpu(const struct x86_cpu_id *match_array) { @@ -3120,6 +3121,7 @@ linuxkpi_x86_match_cpu(const struct x86_cpu_id *match_array) return (NULL); } +#endif /* * NOTE: Linux frequently uses "unsigned long" for pointer to integer