[src/trunk]: src/sys/compat/irix irix_sys_swapctl: follow uvm_swap_stats chan...

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

details:   https://anonhg.NetBSD.org/src/rev/12456acd6e85
branches:  trunk
changeset: 584442:12456acd6e85
user:      yamt <yamt%NetBSD.org@localhost>
date:      Sat Sep 17 14:52:55 2005 +0000

description:
irix_sys_swapctl: follow uvm_swap_stats changes.

diffstat:

 sys/compat/irix/irix_swap.c |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r 8a4e792ab154 -r 12456acd6e85 sys/compat/irix/irix_swap.c
--- a/sys/compat/irix/irix_swap.c       Sat Sep 17 14:51:50 2005 +0000
+++ b/sys/compat/irix/irix_swap.c       Sat Sep 17 14:52:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: irix_swap.c,v 1.13 2005/02/26 23:10:18 perry Exp $ */
+/*     $NetBSD: irix_swap.c,v 1.14 2005/09/17 14:52:55 yamt Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.13 2005/02/26 23:10:18 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.14 2005/09/17 14:52:55 yamt Exp $");
 
 #include <sys/types.h>
 #include <sys/signal.h>
@@ -63,8 +63,6 @@
 #include <compat/irix/irix_syscall.h>
 #include <compat/irix/irix_syscallargs.h>
 
-extern struct lock swap_syscall_lock;
-
 int
 irix_sys_swapctl(l, v, retval)
        struct lwp *l;
@@ -147,9 +145,7 @@
                if ((error = copyin(uise, ise, ilen)) != 0)
                        return error;
 
-               lockmgr(&swap_syscall_lock, LK_EXCLUSIVE, NULL);
                uvm_swap_stats(SWAP_STATS, bse, ist.swt_n, retval);
-               lockmgr(&swap_syscall_lock, LK_RELEASE, NULL);
 
                for (i = 0; i < ist.swt_n; i++) {
 
@@ -199,10 +195,8 @@
 
                sep = (struct swapent *)malloc(
                    sizeof(struct swapent) * entries, M_TEMP, M_WAITOK);
-               lockmgr(&swap_syscall_lock, LK_EXCLUSIVE, NULL);
                uvm_swap_stats(SWAP_STATS, sep, entries,
                    (register_t *)(void *)&dontcare);
-               lockmgr(&swap_syscall_lock, LK_RELEASE, NULL);
 
                if (SCARG(uap, cmd) == IRIX_SC_GETFREESWAP)
                        for (i = 0; i < entries; i++)