[src/trunk]: src/sys/uvm In the function uvm_page_own(), clear owner_tag afte...

[enami <enami%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2075d646c697
branches:  trunk
changeset: 522488:2075d646c697
user:      enami <enami%NetBSD.org@localhost>
date:      Wed Feb 20 07:06:56 2002 +0000

description:
In the function uvm_page_own(), clear owner_tag after assertion so that
we can see the owner when assertion failed.  Some indentation fix while
I'm here.

diffstat:

 sys/uvm/uvm_page.c |  19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diffs (48 lines):

diff -r 7136a41edbd4 -r 2075d646c697 sys/uvm/uvm_page.c
--- a/sys/uvm/uvm_page.c        Wed Feb 20 06:16:22 2002 +0000
+++ b/sys/uvm/uvm_page.c        Wed Feb 20 07:06:56 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_page.c,v 1.73 2001/12/31 19:21:37 chs Exp $        */
+/*     $NetBSD: uvm_page.c,v 1.74 2002/02/20 07:06:56 enami Exp $      */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.73 2001/12/31 19:21:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.74 2002/02/20 07:06:56 enami Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -1358,7 +1358,7 @@
                if (pg->owner_tag) {
                        printf("uvm_page_own: page %p already owned "
                            "by proc %d [%s]\n", pg,
-                            pg->owner, pg->owner_tag);
+                           pg->owner, pg->owner_tag);
                        panic("uvm_page_own");
                }
                pg->owner = (curproc) ? curproc->p_pid :  (pid_t) -1;
@@ -1372,14 +1372,13 @@
                    "page (%p)\n", pg);
                panic("uvm_page_own");
        }
+       KASSERT((pg->pqflags & (PQ_ACTIVE|PQ_INACTIVE)) ||
+           (pg->uanon == NULL && pg->uobject == NULL) ||
+           pg->uobject == uvm.kernel_object ||
+           pg->wire_count > 0 ||
+           (pg->loan_count == 1 && pg->uanon == NULL) ||
+           pg->loan_count > 1);
        pg->owner_tag = NULL;
-       KASSERT((pg->pqflags & (PQ_ACTIVE|PQ_INACTIVE)) ||
-               (pg->uanon == NULL && pg->uobject == NULL) ||
-               pg->uobject == uvm.kernel_object ||
-               pg->wire_count > 0 ||
-               (pg->loan_count == 1 && pg->uanon == NULL) ||
-               pg->loan_count > 1);
-       return;
 }
 #endif