From owner-svn-src-user@FreeBSD.ORG  Sat Oct 12 12:23:06 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9A9DFD32;
 Sat, 12 Oct 2013 12:23:06 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 891112B2B;
 Sat, 12 Oct 2013 12:23:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CCN6XT090233;
 Sat, 12 Oct 2013 12:23:06 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CCN6ot090232;
 Sat, 12 Oct 2013 12:23:06 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201310121223.r9CCN6ot090232@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sat, 12 Oct 2013 12:23:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r256375 - 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: Sat, 12 Oct 2013 12:23:06 -0000

Author: dchagin
Date: Sat Oct 12 12:23:06 2013
New Revision: 256375
URL: http://svnweb.freebsd.org/changeset/base/256375

Log:
  Remove the deprecated VM_ALLOC_RETRY flag for the vm_page_grab(9).
  Replace kernel virtual address space allocation with vmem - r254025.

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	Sat Oct 12 12:20:09 2013	(r256374)
+++ user/dchagin/lemul/sys/compat/linux/linux_vdso.c	Sat Oct 12 12:23:06 2013	(r256375)
@@ -83,11 +83,10 @@ __elfN(linux_shared_page_init)(char **ma
 	obj = vm_pager_allocate(OBJT_PHYS, 0, PAGE_SIZE,
 	    VM_PROT_DEFAULT, 0, NULL);
 	VM_OBJECT_WLOCK(obj);
-	m = vm_page_grab(obj, 0, VM_ALLOC_RETRY | VM_ALLOC_NOBUSY |
-	    VM_ALLOC_ZERO);
+	m = vm_page_grab(obj, 0, VM_ALLOC_NOBUSY | VM_ALLOC_ZERO);
 	m->valid = VM_PAGE_BITS_ALL;
 	VM_OBJECT_WUNLOCK(obj);
-	addr = kmem_alloc_nofault(kernel_map, PAGE_SIZE);
+	addr = kva_alloc(PAGE_SIZE);
 	pmap_qenter(addr, &m, 1);
 	*mapping = (char *)addr;
 	return (obj);