From owner-p4-projects@FreeBSD.ORG  Sat Sep 15 19:41:50 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 73AAD16A421; Sat, 15 Sep 2007 19:41:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 512A016A417
	for <perforce@freebsd.org>; Sat, 15 Sep 2007 19:41:50 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3428B13C442
	for <perforce@freebsd.org>; Sat, 15 Sep 2007 19:41:50 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FJfnCL097759
	for <perforce@freebsd.org>; Sat, 15 Sep 2007 19:41:49 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FJfn3Q097756
	for perforce@freebsd.org; Sat, 15 Sep 2007 19:41:49 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 15 Sep 2007 19:41:49 GMT
Message-Id: <200709151941.l8FJfn3Q097756@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 126437 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: Sat, 15 Sep 2007 19:41:50 -0000

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

Change 126437 by kmacy@kmacy_home:ethng on 2007/09/15 19:41:10

	switch x86_64 over to allocating kva for contigmalloc out of the direct map

Affected files ...

.. //depot/projects/ethng/src/sys/amd64/amd64/vm_machdep.c#2 edit
.. //depot/projects/ethng/src/sys/amd64/include/vmparam.h#2 edit

Differences ...

==== //depot/projects/ethng/src/sys/amd64/amd64/vm_machdep.c#2 (text+ko) ====

@@ -566,3 +566,23 @@
 
 	return 1;
 }
+
+void *
+contigmalloc2(vm_page_t m, vm_pindex_t npages, int flags)
+{
+        return (void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m));
+}
+
+void
+contigfree(void *addr, unsigned long size, struct malloc_type *type)
+{
+	vm_pindex_t npgs;
+	vm_page_t m;
+	int i;
+	
+	npgs = round_page(size) >> PAGE_SHIFT;
+	m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)addr));
+	for (i = 0; i < npgs; i++, m++) 
+		vm_page_free(m);
+	malloc_type_freed(type, npgs << PAGE_SHIFT);
+}

==== //depot/projects/ethng/src/sys/amd64/include/vmparam.h#2 (text+ko) ====

@@ -185,4 +185,10 @@
 #define	VM_INITIAL_PAGEIN	16
 #endif
 
+/*
+ * We provide a machine specific contiguous mapping function
+ * which uses the direct map
+ */
+#define VM_MD_CONTIG
+
 #endif /* _MACHINE_VMPARAM_H_ */