The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ab8dc298e7ab022120daa9f7b8980030fa8104d
commit 9ab8dc298e7ab022120daa9f7b8980030fa8104d Author: Konstantin Belousov <k...@freebsd.org> AuthorDate: 2025-08-28 17:34:00 +0000 Commit: Konstantin Belousov <k...@freebsd.org> CommitDate: 2025-09-04 00:43:15 +0000 vm_fault.c: rename vm_fault_quick_hold_pages_e() to vm_fault_hold_pages_e() (cherry picked from commit c18e41de7436f5f3c2516f48fabe6577e082547f) --- sys/vm/vm_extern.h | 4 ++-- sys/vm/vm_fault.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 6057131668e1..c5d2b2e34271 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -93,10 +93,10 @@ void vm_fault_copy_entry(vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t, vm_ooffset_t *); int vm_fault_disable_pagefaults(void); void vm_fault_enable_pagefaults(int save); +int vm_fault_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, + vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count); int vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, vm_prot_t prot, vm_page_t *ma, int max_count); -int vm_fault_quick_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, - vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count); int vm_fault_trap(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, int fault_flags, int *signo, int *ucode); int vm_forkproc(struct thread *, struct proc *, struct thread *, diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 0d6850d9e602..ed4213afdb8f 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1988,7 +1988,7 @@ vm_fault_prefault(const struct faultstate *fs, vm_offset_t addra, * (more detailed result from vm_fault() is lost) */ int -vm_fault_quick_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, +vm_fault_hold_pages_e(vm_map_t map, vm_offset_t addr, vm_size_t len, vm_prot_t prot, vm_page_t *ma, int max_count, int *ppages_count) { vm_offset_t end, va; @@ -2084,7 +2084,7 @@ vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, { int error, pages_count; - error = vm_fault_quick_hold_pages_e(map, addr, len, prot, ma, + error = vm_fault_hold_pages_e(map, addr, len, prot, ma, max_count, &pages_count); if (error != 0) { if (error == EINVAL)