From owner-svn-src-head@FreeBSD.ORG  Wed Jun 24 16:52:31 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABD28106571A;
	Wed, 24 Jun 2009 16:52:31 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A7278FC08;
	Wed, 24 Jun 2009 16:52:30 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5OGqUm5021069;
	Wed, 24 Jun 2009 16:52:30 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5OGqUFm021067;
	Wed, 24 Jun 2009 16:52:30 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200906241652.n5OGqUFm021067@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 24 Jun 2009 16:52:30 +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: r194858 - head/sys/sparc64/sparc64
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jun 2009 16:52:32 -0000

Author: kib
Date: Wed Jun 24 16:52:30 2009
New Revision: 194858
URL: http://svn.freebsd.org/changeset/base/194858

Log:
  Unbreak sparc64 after the swap accounting changes: mark kernel_map
  entries allocated for translations in pmap_init() as MAP_NOFAULT. This
  prevents vm_map_insert from trying to account the entries for swap
  usage, that is both wrong and too early to work.
  
  While there, change FALSE to VMFS_NO_SPACE.
  
  Reported and tested by:	Florian Smeets <flo at kasimir com>
  Reviewed by:	marius

Modified:
  head/sys/sparc64/sparc64/pmap.c

Modified: head/sys/sparc64/sparc64/pmap.c
==============================================================================
--- head/sys/sparc64/sparc64/pmap.c	Wed Jun 24 16:52:23 2009	(r194857)
+++ head/sys/sparc64/sparc64/pmap.c	Wed Jun 24 16:52:30 2009	(r194858)
@@ -629,8 +629,8 @@ pmap_init(void)
 			continue;
 		if (addr < VM_MIN_PROM_ADDRESS || addr > VM_MAX_PROM_ADDRESS)
 			continue;
-		result = vm_map_find(kernel_map, NULL, 0, &addr, size, FALSE,
-		    VM_PROT_ALL, VM_PROT_ALL, 0);
+		result = vm_map_find(kernel_map, NULL, 0, &addr, size,
+		    VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, MAP_NOFAULT);
 		if (result != KERN_SUCCESS || addr != translations[i].om_start)
 			panic("pmap_init: vm_map_find");
 	}