Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/uvm/uvm_fault.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/uvm/uvm_fault.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.123 retrieving revision 1.123.6.2 diff -u -p -r1.123 -r1.123.6.2 --- src/sys/uvm/uvm_fault.c 2008/01/18 10:48:23 1.123 +++ src/sys/uvm/uvm_fault.c 2008/09/28 10:41:07 1.123.6.2 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_fault.c,v 1.123 2008/01/18 10:48:23 yamt Exp $ */ +/* $NetBSD: uvm_fault.c,v 1.123.6.2 2008/09/28 10:41:07 mjf Exp $ */ /* * @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.123 2008/01/18 10:48:23 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.123.6.2 2008/09/28 10:41:07 mjf Exp $"); #include "opt_uvmhist.h" @@ -146,9 +146,8 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_fault.c, * by multiple map entries, and figuring out what should wait could be * complex as well...). * - * given that we are not currently multiprocessor or multithreaded we might - * as well choose alternative 2 now. maybe alternative 3 would be useful - * in the future. XXX keep in mind for future consideration//rechecking. + * we use alternative 2. given that we are multi-threaded now we may want + * to reconsider the choice. */ /* @@ -295,9 +294,9 @@ uvmfault_anonget(struct uvm_faultinfo *u uvmexp.fltanget++; /* bump rusage counters */ if (anon->an_page) - curproc->p_stats->p_ru.ru_minflt++; + curlwp->l_ru.ru_minflt++; else - curproc->p_stats->p_ru.ru_majflt++; + curlwp->l_ru.ru_majflt++; /* * loop until we get it, or fail. @@ -1490,10 +1489,10 @@ Case2: if (uobjpage) { /* update rusage counters */ - curproc->p_stats->p_ru.ru_minflt++; + curlwp->l_ru.ru_minflt++; } else { /* update rusage counters */ - curproc->p_stats->p_ru.ru_majflt++; + curlwp->l_ru.ru_majflt++; /* locked: maps(read), amap(if there), uobj */ uvmfault_unlockall(&ufi, amap, NULL, NULL);