From owner-svn-src-projects@FreeBSD.ORG  Sun Jul 17 16:21:16 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B5DEB106566C;
	Sun, 17 Jul 2011 16:21:16 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A69C98FC08;
	Sun, 17 Jul 2011 16:21:16 +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 p6HGLGwc080675;
	Sun, 17 Jul 2011 16:21:16 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6HGLGGE080673;
	Sun, 17 Jul 2011 16:21:16 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201107171621.p6HGLGGE080673@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 17 Jul 2011 16:21:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224137 - projects/altix/sys/ia64/ia64
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jul 2011 16:21:16 -0000

Author: marcel
Date: Sun Jul 17 16:21:16 2011
New Revision: 224137
URL: http://svn.freebsd.org/changeset/base/224137

Log:
  On head I made pmap_mapdev() strict. This is not good for the Altix, as
  we have I/O memory translation on top of address spaces. None of that is
  covered by memory descriptors. So, restore the old behavior of returning
  a region 6 VA if there's no MD describing the PA.

Modified:
  projects/altix/sys/ia64/ia64/pmap.c

Modified: projects/altix/sys/ia64/ia64/pmap.c
==============================================================================
--- projects/altix/sys/ia64/ia64/pmap.c	Sun Jul 17 15:41:32 2011	(r224136)
+++ projects/altix/sys/ia64/ia64/pmap.c	Sun Jul 17 16:21:16 2011	(r224137)
@@ -2251,7 +2251,7 @@ pmap_mapdev(vm_paddr_t pa, vm_size_t sz)
 	if (md == NULL) {
 		printf("%s: [%#lx..%#lx] not covered by memory descriptor\n",
 		    __func__, pa, pa + sz - 1);
-		return (NULL);
+		return ((void *)IA64_PHYS_TO_RR6(pa));
 	}
 
 	if (md->md_type == EFI_MD_TYPE_FREE) {