From owner-svn-src-user@FreeBSD.ORG  Sun Mar 17 18:34:10 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 458BE27F;
 Sun, 17 Mar 2013 18:34:10 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 240B9D5A;
 Sun, 17 Mar 2013 18:34:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2HIYAXN005000;
 Sun, 17 Mar 2013 18:34:10 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2HIYACQ004999;
 Sun, 17 Mar 2013 18:34:10 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201303171834.r2HIYACQ004999@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sun, 17 Mar 2013 18:34:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r248436 - user/dchagin/lemul/sys/compat/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Mar 2013 18:34:10 -0000

Author: dchagin
Date: Sun Mar 17 18:34:09 2013
New Revision: 248436
URL: http://svnweb.freebsd.org/changeset/base/248436

Log:
  Switch the vm_object mutex to be a rwlock as a r248084 do.

Modified:
  user/dchagin/lemul/sys/compat/linux/linux_vdso.c

Modified: user/dchagin/lemul/sys/compat/linux/linux_vdso.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_vdso.c	Sun Mar 17 18:33:06 2013	(r248435)
+++ user/dchagin/lemul/sys/compat/linux/linux_vdso.c	Sun Mar 17 18:34:09 2013	(r248436)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/elf.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mutex.h>
+#include <sys/rwlock.h>
 #include <sys/queue.h>
 #include <sys/sysent.h>
 
@@ -78,11 +78,11 @@ __elfN(linux_shared_page_init)(char **ma
 
 	obj = vm_pager_allocate(OBJT_PHYS, 0, PAGE_SIZE,
 	    VM_PROT_DEFAULT, 0, NULL);
-	VM_OBJECT_LOCK(obj);
+	VM_OBJECT_WLOCK(obj);
 	m = vm_page_grab(obj, 0, VM_ALLOC_RETRY | VM_ALLOC_NOBUSY |
 	    VM_ALLOC_ZERO);
 	m->valid = VM_PAGE_BITS_ALL;
-	VM_OBJECT_UNLOCK(obj);
+	VM_OBJECT_WUNLOCK(obj);
 	addr = kmem_alloc_nofault(kernel_map, PAGE_SIZE);
 	pmap_qenter(addr, &m, 1);
 	*mapping = (char *)addr;