[src/chs-ubc2]: src/sys/uvm Fix a merge error.

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

details:   https://anonhg.NetBSD.org/src/rev/ef57115824ca
branches:  chs-ubc2
changeset: 471447:ef57115824ca
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Aug 02 23:37:04 1999 +0000

description:
Fix a merge error.

diffstat:

 sys/uvm/uvm_pager.c |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 2d702805da44 -r ef57115824ca sys/uvm/uvm_pager.c
--- a/sys/uvm/uvm_pager.c       Mon Aug 02 23:31:17 1999 +0000
+++ b/sys/uvm/uvm_pager.c       Mon Aug 02 23:37:04 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pager.c,v 1.16.4.5 1999/07/31 19:01:33 chs Exp $   */
+/*     $NetBSD: uvm_pager.c,v 1.16.4.6 1999/08/02 23:37:04 thorpej Exp $       */
 
 /*
  *
@@ -498,10 +498,8 @@
 ReTry:
        if (uobj) {
                /* object is locked */
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
                result = uobj->pgops->pgo_put(uobj, ppsp, *npages, flags);
                /* object is now unlocked */
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_UNLOCKED);
        } else {
                /* nothing locked */
                result = uvm_swap_put(swblk, ppsp, *npages, flags);