From owner-p4-projects@FreeBSD.ORG  Thu Jul  5 07:30:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5495616A41F; Thu,  5 Jul 2007 07:30:14 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 19FD016A51E
	for <perforce@freebsd.org>; Thu,  5 Jul 2007 07:30:13 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C4EF13C4BD
	for <perforce@freebsd.org>; Thu,  5 Jul 2007 07:30:13 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l657UDxe017264
	for <perforce@freebsd.org>; Thu, 5 Jul 2007 07:30:13 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l657UDPo017260
	for perforce@freebsd.org; Thu, 5 Jul 2007 07:30:13 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 5 Jul 2007 07:30:13 GMT
Message-Id: <200707050730.l657UDPo017260@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122916 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jul 2007 07:30:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=122916

Change 122916 by kmacy@kmacy_vt-x:opentoe_init on 2007/07/05 07:29:46

	turn contigmalloc2 into a no-op on x86_64	

Affected files ...

.. //depot/projects/opentoe/sys/vm/vm_contig.c#6 edit

Differences ...

==== //depot/projects/opentoe/sys/vm/vm_contig.c#6 (text+ko) ====

@@ -190,7 +190,11 @@
 	vm_map_t map = kernel_map;
 	vm_offset_t addr, tmp_addr;
 	vm_pindex_t i;
- 
+
+#ifdef __amd64__
+	return (void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m));
+#endif
+	
 	/*
 	 * Allocate kernel VM, unfree and assign the physical pages to
 	 * it and return kernel VM pointer.