--- Gnu-Mach/vm/vm_object.h 2020/09/02 04:52:09 1.1.1.6 +++ Gnu-Mach/vm/vm_object.h 2020/09/02 04:54:14 1.1.1.7 @@ -150,9 +150,6 @@ struct vm_object { /* Should lock request in * progress restart search? */ - /* boolean_t */ use_old_pageout : 1, - /* Use old pageout primitives? - */ /* boolean_t */ use_shared_copy : 1,/* Use shared (i.e., * delayed) copy on write */ /* boolean_t */ shadowed: 1, /* Shadow may exist */ @@ -394,20 +391,9 @@ MACRO_END /* * Page cache accounting. * - * The number of cached objects and pages can be read - * without holding any lock. + * The page queues must be locked when changing these counters. */ - -extern int vm_object_cached_count; - -extern int vm_object_cached_pages; -decl_simple_lock_data(extern,vm_object_cached_pages_lock_data) - -#define vm_object_cached_pages_update(page_count) \ - MACRO_BEGIN \ - simple_lock(&vm_object_cached_pages_lock_data); \ - vm_object_cached_pages += (page_count); \ - simple_unlock(&vm_object_cached_pages_lock_data); \ - MACRO_END +extern int vm_object_external_count; +extern int vm_object_external_pages; #endif /* _VM_VM_OBJECT_H_ */