[src/netbsd-6]: src Pull up following revision(s) (requested by hannken in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/74a293853231
branches:  netbsd-6
changeset: 773961:74a293853231
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Mar 25 11:29:59 2012 +0000

description:
Pull up following revision(s) (requested by hannken in ticket #141):
        tests/rump/rumpkern/t_vm.c: revision 1.3
        sys/rump/librump/rumpkern/vm.c: revision 1.125
Don't take a mutex we already took 6 lines above.
Starting with Rev. 1.191 of kern/subr_pool.c a pool has to be inactive
for at least 10 seconds before it can be reclaimed.
Change the uvmwait test timeout from 10 to 30 seconds so it has a chance
to reclaim memory and succeed.

diffstat:

 sys/rump/librump/rumpkern/vm.c |  5 ++---
 tests/rump/rumpkern/t_vm.c     |  4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 9b6979ba4116 -r 74a293853231 sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Sun Mar 25 11:25:26 2012 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Sun Mar 25 11:29:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm.c,v 1.122 2012/01/29 14:57:31 njoly Exp $   */
+/*     $NetBSD: vm.c,v 1.122.2.1 2012/03/25 11:29:59 bouyer Exp $      */
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.122 2012/01/29 14:57:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.122.2.1 2012/03/25 11:29:59 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -1110,7 +1110,6 @@
                        rumpuser_dprintf("pagedaemoness: failed to reclaim "
                            "memory ... sleeping (deadlock?)\n");
                        cv_timedwait(&pdaemoncv, &pdaemonmtx, hz);
-                       mutex_enter(&pdaemonmtx);
                }
        }
 
diff -r 9b6979ba4116 -r 74a293853231 tests/rump/rumpkern/t_vm.c
--- a/tests/rump/rumpkern/t_vm.c        Sun Mar 25 11:25:26 2012 +0000
+++ b/tests/rump/rumpkern/t_vm.c        Sun Mar 25 11:29:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_vm.c,v 1.2 2010/06/14 21:06:09 pooka Exp $   */
+/*     $NetBSD: t_vm.c,v 1.2.8.1 2012/03/25 11:29:59 bouyer Exp $      */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 {
 
        atf_tc_set_md_var(tc, "descr", "Tests that uvm_wait works");
-       atf_tc_set_md_var(tc, "timeout", "10");
+       atf_tc_set_md_var(tc, "timeout", "30");
 }
 
 #define UVMWAIT_LIMIT 1024*1024