From owner-svn-src-all@FreeBSD.ORG  Thu Dec 15 15:17:19 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4E1F1065672;
	Thu, 15 Dec 2011 15:17:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D37508FC14;
	Thu, 15 Dec 2011 15:17:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBFFHJiW054405;
	Thu, 15 Dec 2011 15:17:19 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBFFHJ5N054402;
	Thu, 15 Dec 2011 15:17:19 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201112151517.pBFFHJ5N054402@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 15 Dec 2011 15:17:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228533 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Dec 2011 15:17:20 -0000

Author: jhb
Date: Thu Dec 15 15:17:19 2011
New Revision: 228533
URL: http://svn.freebsd.org/changeset/base/228533

Log:
  Use vm_mmap_to_errno().
  
  Submitted by:	kib

Modified:
  head/sys/kern/uipc_shm.c

Modified: head/sys/kern/uipc_shm.c
==============================================================================
--- head/sys/kern/uipc_shm.c	Thu Dec 15 12:49:10 2011	(r228532)
+++ head/sys/kern/uipc_shm.c	Thu Dec 15 15:17:19 2011	(r228533)
@@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
+#include <vm/vm_extern.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_object.h>
@@ -790,15 +791,7 @@ shm_map(struct file *fp, size_t size, of
 	shmfd->shm_kmappings--;
 	VM_OBJECT_UNLOCK(obj);
 
-	switch (rv) {
-	case KERN_INVALID_ADDRESS:
-	case KERN_NO_SPACE:
-		return (ENOMEM);
-	case KERN_PROTECTION_FAILURE:
-		return (EACCES);
-	default:
-		return (EINVAL);
-	}
+	return (vm_mmap_to_errno(rv));
 }
 
 /*