diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2023-04-25 17:52:26 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2023-05-03 09:36:32 +0000 |
commit | 3f527b4b8fd5555e72d8cd3e388a28f0f7496e30 (patch) | |
tree | 416fe7d7b8cce88e7ccfca907e9160f2c50b673f | |
parent | 44f4aaee6be33d7e2afe3ce0f0fb856e83da01d7 (diff) |
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
(cherry picked from commit f74be55e3045793a507d98127faf9aabd918e1ce)
-rw-r--r-- | sys/vm/default_pager.c | 2 | ||||
-rw-r--r-- | sys/vm/phys_pager.c | 2 | ||||
-rw-r--r-- | sys/vm/sg_pager.c | 4 | ||||
-rw-r--r-- | sys/vm/swap_pager.c | 2 | ||||
-rw-r--r-- | sys/vm/vm_pager.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c index 877e6441d596..b94279f0198b 100644 --- a/sys/vm/default_pager.c +++ b/sys/vm/default_pager.c @@ -53,7 +53,7 @@ static void default_pager_dealloc(vm_object_t); static int default_pager_getpages(vm_object_t, vm_page_t *, int, int *, int *); static void default_pager_putpages(vm_object_t, vm_page_t *, int, - boolean_t, int *); + int, int *); static boolean_t default_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c index dfddbd81061b..5054a7d8e3f6 100644 --- a/sys/vm/phys_pager.c +++ b/sys/vm/phys_pager.c @@ -290,7 +290,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 a31c2bb8fd27..09e90dbf1f19 100644 --- a/sys/vm/sg_pager.c +++ b/sys/vm/sg_pager.c @@ -55,7 +55,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 *); @@ -210,7 +210,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 516be82c474f..d30c5a69ead1 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -369,7 +369,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 3864c9dfc1c4..fd39ddbcd728 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -123,7 +123,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) { |