From owner-p4-projects@FreeBSD.ORG  Sat Sep 15 19:40:49 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C341D16A4E1; Sat, 15 Sep 2007 19:40:48 +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 7B89F16A4D6
	for <perforce@freebsd.org>; Sat, 15 Sep 2007 19:40:48 +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 5E34513C442
	for <perforce@freebsd.org>; Sat, 15 Sep 2007 19:40:48 +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 l8FJemIB097557
	for <perforce@freebsd.org>; Sat, 15 Sep 2007 19:40:48 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FJelcx097554
	for perforce@freebsd.org; Sat, 15 Sep 2007 19:40:47 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 15 Sep 2007 19:40:47 GMT
Message-Id: <200709151940.l8FJelcx097554@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 126436 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:40:49 -0000

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

Change 126436 by kmacy@kmacy_home:ethng on 2007/09/15 19:40:01

	Allow architectures to define their own contigmalloc2 variant
	- this makes it possible for them to simply use the direct map 
	  rather than mapping each page on allocate and unmapping on free

Affected files ...

.. //depot/projects/ethng/src/sys/vm/vm_contig.c#2 edit
.. //depot/projects/ethng/src/sys/vm/vm_extern.h#2 edit

Differences ...

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

@@ -183,7 +183,8 @@
 	vm_page_unlock_queues();
 }
 
-static void *
+#ifndef VM_MD_CONTIG
+void *
 contigmalloc2(vm_page_t m, vm_pindex_t npages, int flags)
 {
 	vm_object_t object = kernel_object;
@@ -220,6 +221,17 @@
 	return ((void *)addr);
 }
 
+void
+contigfree(void *addr, unsigned long size, struct malloc_type *type)
+{
+	vm_pindex_t npgs;
+
+	npgs = round_page(size) >> PAGE_SHIFT;
+	kmem_free(kernel_map, (vm_offset_t)addr, size);
+	malloc_type_freed(type, npgs << PAGE_SHIFT);
+}
+#endif
+
 void *
 contigmalloc(
 	unsigned long size,	/* should be size_t here and for malloc() */
@@ -280,12 +292,3 @@
 	return (ret);
 }
 
-void
-contigfree(void *addr, unsigned long size, struct malloc_type *type)
-{
-	vm_pindex_t npgs;
-
-	npgs = round_page(size) >> PAGE_SHIFT;
-	kmem_free(kernel_map, (vm_offset_t)addr, size);
-	malloc_type_freed(type, npgs << PAGE_SHIFT);
-}

==== //depot/projects/ethng/src/sys/vm/vm_extern.h#2 (text+ko) ====

@@ -96,5 +96,7 @@
 void vm_thread_new_altkstack(struct thread *td, int pages);
 void vm_thread_swapin(struct thread *td);
 void vm_thread_swapout(struct thread *td);
+
+void *contigmalloc2(vm_page_t m, vm_pindex_t npages, int flags);
 #endif				/* _KERNEL */
 #endif				/* !_VM_EXTERN_H_ */