diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -591,22 +591,9 @@ #define PS_ALL_VALID 0x2 #define PS_NONE_BUSY 0x4 -bool vm_page_busy_acquire(vm_page_t m, int allocflags); -void vm_page_busy_downgrade(vm_page_t m); -int vm_page_busy_tryupgrade(vm_page_t m); -bool vm_page_busy_sleep(vm_page_t m, const char *msg, int allocflags); -void vm_page_busy_sleep_unlocked(vm_object_t obj, vm_page_t m, - vm_pindex_t pindex, const char *wmesg, int allocflags); -void vm_page_free(vm_page_t m); -void vm_page_free_zero(vm_page_t m); - void vm_page_activate (vm_page_t); void vm_page_advise(vm_page_t m, int advice); vm_page_t vm_page_alloc(vm_object_t, vm_pindex_t, int); -vm_page_t vm_page_alloc_iter(vm_object_t, vm_pindex_t, int, - struct pctrie_iter *); -vm_page_t vm_page_alloc_domain_iter(vm_object_t, vm_pindex_t, int, int, - struct pctrie_iter *); vm_page_t vm_page_alloc_contig(vm_object_t object, vm_pindex_t pindex, int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary, vm_memattr_t memattr); @@ -614,6 +601,10 @@ vm_pindex_t pindex, int domain, int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary, vm_memattr_t memattr); +vm_page_t vm_page_alloc_domain_iter(vm_object_t object, vm_pindex_t pindex, + int domain, int req, struct pctrie_iter *pages); +vm_page_t vm_page_alloc_iter(vm_object_t object, vm_pindex_t pindex, int req, + struct pctrie_iter *pages); vm_page_t vm_page_alloc_noobj(int); vm_page_t vm_page_alloc_noobj_domain(int, int); vm_page_t vm_page_alloc_noobj_contig(int req, u_long npages, vm_paddr_t low, @@ -624,6 +615,21 @@ vm_memattr_t memattr); void vm_page_bits_set(vm_page_t m, vm_page_bits_t *bits, vm_page_bits_t set); bool vm_page_blacklist_add(vm_paddr_t pa, bool verbose); +bool vm_page_busy_acquire(vm_page_t m, int allocflags); +void vm_page_busy_downgrade(vm_page_t m); +int vm_page_busy_tryupgrade(vm_page_t m); +bool vm_page_busy_sleep(vm_page_t m, const char *msg, int allocflags); +void vm_page_busy_sleep_unlocked(vm_object_t obj, vm_page_t m, + vm_pindex_t pindex, const char *wmesg, int allocflags); +void vm_page_deactivate(vm_page_t m); +void vm_page_deactivate_noreuse(vm_page_t m); +void vm_page_dequeue(vm_page_t m); +void vm_page_dequeue_deferred(vm_page_t m); +void vm_page_free(vm_page_t m); +void vm_page_free_invalid(vm_page_t m); +int vm_page_free_pages_toq(struct spglist *free, bool update_wire_count); +void vm_page_free_zero(vm_page_t m); +vm_page_t vm_page_getfake(vm_paddr_t paddr, vm_memattr_t memattr); int vm_page_grab_zero_partial(vm_object_t object, vm_pindex_t pindex, int base, int end); vm_page_t vm_page_grab(vm_object_t, vm_pindex_t, int); @@ -640,12 +646,6 @@ vm_pindex_t pindex, int allocflags, struct pctrie_iter *pages); int vm_page_grab_valid_unlocked(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex, int allocflags); -void vm_page_deactivate(vm_page_t); -void vm_page_deactivate_noreuse(vm_page_t); -void vm_page_dequeue(vm_page_t m); -void vm_page_dequeue_deferred(vm_page_t m); -void vm_page_free_invalid(vm_page_t); -vm_page_t vm_page_getfake(vm_paddr_t paddr, vm_memattr_t memattr); void vm_page_initfake(vm_page_t m, vm_paddr_t paddr, vm_memattr_t memattr); void vm_page_init_marker(vm_page_t marker, int queue, uint16_t aflags); void vm_page_init_page(vm_page_t m, vm_paddr_t pa, int segind, int pool); @@ -712,7 +712,6 @@ void vm_page_test_dirty(vm_page_t); vm_page_bits_t vm_page_bits(int base, int size); void vm_page_zero_invalid(vm_page_t m, boolean_t setvalid); -int vm_page_free_pages_toq(struct spglist *free, bool update_wire_count); void vm_page_dirty_KBI(vm_page_t m); void vm_page_lock_KBI(vm_page_t m, const char *file, int line);