summaryrefslogtreecommitdiff
path: root/sys/vm/vm_meter.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-04-17 01:25:23 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-04-17 01:25:23 +0000
commit88b359233160997d773bfca12d4654247062701d (patch)
tree54f9173892d3b02700bcb5bd04f403869b91a844 /sys/vm/vm_meter.c
parent823c29b4663430510be1e46e888f930ca96a9ab4 (diff)
Removal of race conditions. Inspired by Charles Hannum's
<mycroft@netbsd.org> reorganization of the vm_collapse logic, although not used verbatim. We no longer collapse objects from the pagedaemon as that is not necessary anymore with the more aggressive collapses that gets done. This also increases performance of loaded systems. Much KNF too.
Diffstat (limited to 'sys/vm/vm_meter.c')
-rw-r--r--sys/vm/vm_meter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 217455c559b..3d96b889c5a 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_meter.c,v 1.3 1996/10/23 15:38:36 deraadt Exp $ */
+/* $OpenBSD: vm_meter.c,v 1.4 1997/04/17 01:25:20 niklas Exp $ */
/* $NetBSD: vm_meter.c,v 1.18 1996/02/05 01:53:59 christos Exp $ */
/*
@@ -203,7 +203,7 @@ vmtotal(totalp)
entry->object.vm_object == NULL)
continue;
entry->object.vm_object->flags |= OBJ_ACTIVE;
- paging |= entry->object.vm_object->paging_in_progress;
+ paging |= vm_object_paging(entry->object.vm_object);
}
if (paging)
totalp->t_pw++;