From nobody Tue Apr 25 17:59:14 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 4Q5VBB3kYlz46VYW; Tue, 25 Apr 2023 17:59:14 +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 4Q5VBB35YPz47cq; Tue, 25 Apr 2023 17:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682445554; 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=QjkPsKhdsWoFo6QAl9oFlRKjo092y6bli/9HN1vZSaQ=; b=X35h4qx8o9dX/4aOigyUmFxr8L3KViv5BOEmviym5sKev1NI/R5RcQk24j66GzhsUgbqQk 41mM4YoMDt2n0Q5dl0I1aKZkfc5peSgk/PfPGDXGC2HiayUXeGFrZuysJjwK2EGAuWpP63 CRqT2vOvuH9q8JAm6jgYWiosPXdm2STZLH8d+NbKPM6isNqU3CeIyZUoGgWSkxU2SmcZYn F8L3QHB1KtJQB38mG8Llvp3u5wPypTyjIT3v1qJXlpLc8L1zwsBJLjpIFtTWnQQ14ShM8k +BYu3G8Xlb13Tb9YwkmTN4ANXeLokNnfiFIME7uQMrQxcioxXLMx6g/OXQExrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682445554; 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=QjkPsKhdsWoFo6QAl9oFlRKjo092y6bli/9HN1vZSaQ=; b=FbWronP4kvu5/7eBlKhu8brEjMgiBmQTu3f9zE1JANL+Egnv/oO6EF7n3excVkvFieKd65 PYYN2enVWHFFTavfIoTOKVCV3mBLinubdAyLahHb5bDtPYB78JBwb+I9sxiVW6t9ythcFH BGbgaIf5h97DkP7Q+qyxAIahfG1YV3zorQp4h409eVv2+2scJr+EDv0lFJ7OVlLfJ+tiSJ lHaqKCRyNtfhYG0TY8a6EFwfh0tnAszuzJ1G2e27ksGBcQ606C0FbAEJnH5aYHZrUclnmq gebPClZJ6+7dZqJrXnkJVAVHbXZrhQLQ77DfAbfAsZNCzn2U0QhjeqQftvl0dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682445554; a=rsa-sha256; cv=none; b=CzxNR+UHeTAEWoiKvG3Hd5kXdwChRMnxkXpC2FQAYEv5AkZdfAJuHu4s+3soOwYZsGZsUf RUn3tM8n+euGRkBH3aYi6uD0BfZ5F8JLZBnj9V7B6RBhkw5AcGgvnK08BaJP6QeZ6zY9jJ geQb3opT99Z5jKo0lfqQJ4RjYdkhHleTZC9ZHr0TbRMG/GuKDmcHdMHM9lPpbr8Cs02+5k Ebhh+sAzs3z6VdwOFjdjxiFdtTi/rSaXCsllUgz4kyCwVnsrmxq+a808HKuTlFU6czXhfI Frxblid7olWrR0PAvVzc5yvEqct0TL8vi5s4Z/lBp7APSU5WrHNQnLPHqHCQAA== 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 4Q5VBB24pcz1HDT; Tue, 25 Apr 2023 17:59:14 +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 33PHxE5b078866; Tue, 25 Apr 2023 17:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33PHxEsU078865; Tue, 25 Apr 2023 17:59:14 GMT (envelope-from git) Date: Tue, 25 Apr 2023 17:59:14 GMT Message-Id: <202304251759.33PHxEsU078865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: f74be55e3045 - main - vm: fix a number of functions to match the expected prototypes 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f74be55e3045793a507d98127faf9aabd918e1ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f74be55e3045793a507d98127faf9aabd918e1ce commit f74be55e3045793a507d98127faf9aabd918e1ce Author: Dimitry Andric AuthorDate: 2023-04-25 17:52:26 +0000 Commit: Dimitry Andric CommitDate: 2023-04-25 17:58:18 +0000 vm: fix a number of functions to match the expected prototypes Noticed while attempting to make boolean_t unsigned: some vm-related function declarations and defintions were using boolean_t where they should have used int, and vice versa. MFC after: 1 week Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D39753 --- sys/vm/phys_pager.c | 2 +- sys/vm/sg_pager.c | 4 ++-- sys/vm/swap_pager.c | 2 +- sys/vm/vm_pager.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c index 6d7c5a4a7291..07ca6f0fc3de 100644 --- a/sys/vm/phys_pager.c +++ b/sys/vm/phys_pager.c @@ -269,7 +269,7 @@ phys_pager_populate(vm_object_t object, vm_pindex_t pidx, int fault_type, } static void -phys_pager_putpages(vm_object_t object, vm_page_t *m, int count, boolean_t sync, +phys_pager_putpages(vm_object_t object, vm_page_t *m, int count, int flags, int *rtvals) { diff --git a/sys/vm/sg_pager.c b/sys/vm/sg_pager.c index d7af2aed935a..bb2e8f39e219 100644 --- a/sys/vm/sg_pager.c +++ b/sys/vm/sg_pager.c @@ -56,7 +56,7 @@ static vm_object_t sg_pager_alloc(void *, vm_ooffset_t, vm_prot_t, static void sg_pager_dealloc(vm_object_t); static int sg_pager_getpages(vm_object_t, vm_page_t *, int, int *, int *); static void sg_pager_putpages(vm_object_t, vm_page_t *, int, - boolean_t, int *); + int, int *); static boolean_t sg_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); @@ -211,7 +211,7 @@ sg_pager_getpages(vm_object_t object, vm_page_t *m, int count, int *rbehind, static void sg_pager_putpages(vm_object_t object, vm_page_t *m, int count, - boolean_t sync, int *rtvals) + int flags, int *rtvals) { panic("sg_pager_putpage called"); diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 6e423ae107a8..38816b364c67 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -426,7 +426,7 @@ static int swap_pager_getpages(vm_object_t, vm_page_t *, int, int *, int *); static int swap_pager_getpages_async(vm_object_t, vm_page_t *, int, int *, int *, pgo_getpages_iodone_t, void *); -static void swap_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *); +static void swap_pager_putpages(vm_object_t, vm_page_t *, int, int, int *); static boolean_t swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, int *after); static void swap_pager_init(void); diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index e24348ed39a0..2a3f136b4bac 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -129,7 +129,7 @@ dead_pager_putpages(vm_object_t object, vm_page_t *m, int count, rtvals[i] = VM_PAGER_AGAIN; } -static int +static boolean_t dead_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *prev, int *next) {