From nobody Tue Feb 14 22:06:32 2023 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 4PGZzr57Mxz3q40P; Tue, 14 Feb 2023 22:06:32 +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 4PGZzr4RBHz4DSN; Tue, 14 Feb 2023 22:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676412392; 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=JzdLAphA6PEfR6ER0hG5gW5ciOp/Cf8/E2TuEswgKnE=; b=YFJoMUh7rPMbq1hJ+lM9tM2nuoidVEkDbVLoL1vpmn5E8W1XH9defm73qITSCgXuVkVbwZ BRFgm/CcCuEIqPQPy92Npraqz6e6e1uiIpmap2vbGSmjvYi2M6BxZs2GNZ+8V+ygHofAK7 L4jvcoBGyWkvTZIrJfwKWtejRWMMLOTSHFVXTtVOFUlpDoBWES1uBzB8cZmottsuojFhy0 daS3HZFokBg7cEucrbO6OiejExvHDKzK7qfuWrPdtXKpF10IXRMC0vi/HBFgDnYkIe2wUs gWejUGKPh6noVgg4Eh17OQJPyTEUIQcSC+Sn/AzoQILVDYd24N5LPOehjlGgXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676412392; 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=JzdLAphA6PEfR6ER0hG5gW5ciOp/Cf8/E2TuEswgKnE=; b=vme6nHgaxPZ31Yvur2MQpcr2Ode3QfP3WsR6GXS9A8nMP54qWga9dCG0DjKeBrn3MW3l2H yYUR7GFll4zyQq49Mypr7+HQ2niKaulMHpLeDB2AWKI5OZXOVoCZtcdWJT81RKkiFfQTbw 1t1iafv8dQXjUngVQDG6utJltF8SWSQDy1J+T3Bsey81xoAxLselr53dJGG0p930UAfNsg 2Rg94xafM165BrzJnRPrmv93udxu5QH+0d8quJGni6C3ByfIEWfnMOXw45KvvKJppJgYgZ B78U2k/h3yQQ/XlNPhbUhUNtOz1kCmXPScFJ+WNYLG1yrS51/3bWJKySNllEcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676412392; a=rsa-sha256; cv=none; b=S8jz5K9TtegflUVQNT04dNQByeRINXlnWQTHD4eEZhG/9l25zTZcVbx89pQ6POtsv0Slre kCMZu7y3S4E7VsExU67WgABQBEt01my80OQAsy8ZBWl1+H0UCS1yNboBxsM47Ty1PnWd0h eGyvEBYfv+/kC4XhTlAJos+LzqODtNFalnJE2oyBVC5LkmEPBaFoUSof6uGAFrlGmKGRtS Y+YUjQMXFhX+tns0AFR7jY+9/COwQcHyYuXEEzO7r7BLydSPIYJXmbTrIB7fIwhYfPjAsE zOA0PFTuiD1p/BuLO84ZE/joum2myp4aR8aUQR9PWhdE4114F2AvkiJo/fP8cw== 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 4PGZzr3LDwz1FLL; Tue, 14 Feb 2023 22:06:32 +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 31EM6W9o004056; Tue, 14 Feb 2023 22:06:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EM6WBA004055; Tue, 14 Feb 2023 22:06:32 GMT (envelope-from git) Date: Tue, 14 Feb 2023 22:06:32 GMT Message-Id: <202302142206.31EM6WBA004055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: 53da54b936e6 - main - linuxkpi: Define `totalram_pages()` 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 53da54b936e646ba1216c0cc19582dad058ca5d0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=53da54b936e646ba1216c0cc19582dad058ca5d0 commit 53da54b936e646ba1216c0cc19582dad058ca5d0 Author: Jean-Sébastien Pédron AuthorDate: 2023-02-08 17:52:43 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-14 22:01:06 +0000 linuxkpi: Define `totalram_pages()` It returns `physmem`. `__FreeBSD_version` is bumped to 1400080. We need that to remove a copy of this function in the i915 DRM driver, maintained outside of base. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D38531 --- sys/compat/linuxkpi/common/include/linux/mm.h | 6 ++++++ sys/sys/param.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index 2dcf32cbe84a..8dab5b9daa76 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -348,6 +348,12 @@ unlock_page(struct page *page) extern int is_vmalloc_addr(const void *addr); void si_meminfo(struct sysinfo *si); +static inline unsigned long +totalram_pages(void) +{ + return ((unsigned long)physmem); +} + #define unmap_mapping_range(...) lkpi_unmap_mapping_range(__VA_ARGS__) void lkpi_unmap_mapping_range(void *obj, loff_t const holebegin __unused, loff_t const holelen, int even_cows __unused); diff --git a/sys/sys/param.h b/sys/sys/param.h index b2c2b1a04b4b..751020f6d087 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400079 +#define __FreeBSD_version 1400080 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,