From nobody Wed Apr 22 21:08:31 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 4g1Bf75l1Zz6bL3M for ; Wed, 22 Apr 2026 21:08:31 +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 4g1Bf73QMvz3kxC for ; Wed, 22 Apr 2026 21:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=scWbAFKSXW3TW188hEMY9Xad32zbgs+yzX9+mz8JQnQ=; b=d2Mkij68hvvITywwj5Fo25mD7CP06pGuy2WONhvD20qTOmm6jDvZdirVTbF1ATrpRn9YM0 7Q3XLK2eXTAP8ARywbu2vmN/JPe+zEeHv1KfYJCou3GW8VaFsj7j76lqMDKLdgD8NxlS2K HnZgHmh3Qc3Z20CsOyO8/BKlWd5a5YfEZunyz+WhHx1dBcBgZVbKeV0NMR2aIxwCyTAkD9 VSdugAPf2VS8gWlsNM6lSuxyCyIAhp9DmUIijIVLKs4Oif6bXRLblBMRbp1t9YuXkRdZAo MRxLFJNG+658+Yc49b3JkqmYdQzQBXVNqXZkzLAE9naWPG2+Rs5nSC3TaJTAEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892111; a=rsa-sha256; cv=none; b=r1Kholvc5pJh4fFpJ0k39vyC4TQKoX11okIFqrID2YCCnDlOSkQyTeXvPBcVYVRyE+EtO1 q+SmDzkc329e8jdHNi+B6GRx/to89S/N/pecrIPqs+sJawWcq5SmVXMpQRIDty+4OBuuwH nhDZ64usUWdSJkYwH/g6IUSYbmRtJ8QxBZyDBvRSKcQ8mwgZXowbmJMeYjTElo/CuHAtz8 K7cAABarm5d1zF1OyYsOmCoBkqDsRK2qXiazrnE2f4aMPM+dno5iCe1QOqT/z5ULt6ZFLj qY12kalp0KNFbI5AzGiHcP4+phWaJjjbvMBPEQLHf63YMPqwHaSZcwyb7NUrXw== 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=1776892111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=scWbAFKSXW3TW188hEMY9Xad32zbgs+yzX9+mz8JQnQ=; b=vfybAQXOAbLYgGODa1Lmu8PczJchR1l/qfMD/kGWDEPD7tkO0zFMvW0gi9MnxdOWp5Vni0 iI1fj1SgTfxU/JF0LAK7WBWh9a++CQ5yLIfPMjHJOsK8Ey44NxUWhWYqBagLc7r487kUIk FE+J9t6jwqd+BKqG05J/s9FAIT4f6qHC3ic8ZS791W/cCo9dayjNMWGEFwGNUhBiWcfGHV UrbqT5/i+STG7K9aO7zPi+VcjPdbCLcwMNSazN6ZEA1Ft1SvApvWgvvsgmTXvW0QGFasfW SJxxv0/8HvzuAJotCl4oZqi3GXtZAQBGyWlOcBBLn29Pv63T6RIPYGRHuJxccg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1Bf71rLgznZb for ; Wed, 22 Apr 2026 21:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30508 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:08:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron From: Bjoern A. Zeeb Subject: git: 5bc46055983d - stable/15 - linuxkpi: Define `CONFIG_PGTABLE_LEVELS` 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5bc46055983ddf24570b3fdd2a66e6a50947e990 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:08:31 +0000 Message-Id: <69e938cf.30508.73523efd@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5bc46055983ddf24570b3fdd2a66e6a50947e990 commit 5bc46055983ddf24570b3fdd2a66e6a50947e990 Author: Jean-Sébastien Pédron AuthorDate: 2026-03-04 20:34:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:57:01 +0000 linuxkpi: Define `CONFIG_PGTABLE_LEVELS` This is a kernel configuration constant that is expected to be defined. The DRM generic code started to use it in Linux 6.11. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55733 (cherry picked from commit 7bf93680807e518853262f3f961f88eb8ec03c83) --- sys/compat/linuxkpi/common/include/linux/kconfig.h | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/kconfig.h b/sys/compat/linuxkpi/common/include/linux/kconfig.h index c1d186b56e1f..529d41991900 100644 --- a/sys/compat/linuxkpi/common/include/linux/kconfig.h +++ b/sys/compat/linuxkpi/common/include/linux/kconfig.h @@ -73,4 +73,39 @@ #define IS_REACHABLE(_x) (IS_BUILTIN(_x) || \ (IS_MODULE(_x) && IS_BUILTIN(MODULE))) +/* + * On Linux, the CONFIG_PGTABLE_LEVELS value is defined by the config/build + * system. Here, we take the per-architecture default value defined in + * `arch/$ARCH/Kconfig` files upstream. + */ +#if defined(__amd64__) + +#define CONFIG_PGTABLE_LEVELS 4 + +#elif defined(__aarch64__) + +#define CONFIG_PGTABLE_LEVELS 4 + +#elif defined(__i386__) + +#define CONFIG_PGTABLE_LEVELS 2 + +#elif defined(__powerpc__) + +#if defined(__powerpc64__) +#define CONFIG_PGTABLE_LEVELS 4 +#else +#define CONFIG_PGTABLE_LEVELS 2 +#endif + +#elif defined(__riscv) + +#if defined(__riscv_xlen) && __riscv_xlen == 64 +#define CONFIG_PGTABLE_LEVELS 5 +#else +#define CONFIG_PGTABLE_LEVELS 2 +#endif + +#endif + #endif /* _LINUXKPI_LINUX_KCONFIG_H_ */