From owner-p4-projects@FreeBSD.ORG  Fri Nov 11 19:14:50 2005
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 3ED1A16A421; Fri, 11 Nov 2005 19:14:50 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F31DB16A41F
	for <perforce@freebsd.org>; Fri, 11 Nov 2005 19:14:49 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BE88B43D46
	for <perforce@freebsd.org>; Fri, 11 Nov 2005 19:14:49 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jABJEn6u028178
	for <perforce@freebsd.org>; Fri, 11 Nov 2005 19:14:49 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jABJEnRC028175
	for perforce@freebsd.org; Fri, 11 Nov 2005 19:14:49 GMT
	(envelope-from millert@freebsd.org)
Date: Fri, 11 Nov 2005 19:14:49 GMT
Message-Id: <200511111914.jABJEnRC028175@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 86662 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: Fri, 11 Nov 2005 19:14:51 -0000

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

Change 86662 by millert@millert_ibook on 2005/11/11 19:14:16

	Remove my horrible hack to make M_NOWAIT sort of work.  It is
	too specific to the size of the policy to be loaded and doesn't
	really help anything.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#11 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#20 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#11 (text+ko) ====

@@ -103,7 +103,7 @@
 #define kmalloc(size, flags)		sebsd_malloc(size, flags)
 #define kfree(addr)			sebsd_free(addr)
 #define __get_free_page(flags)		sebsd_malloc(PAGE_SIZE, flags) 
-#define GFP_ATOMIC  M_NOWAIT
+#define GFP_ATOMIC  M_WAITOK		/* XXX - want M_NOWAIT but too early */
 #define GFP_KERNEL  M_WAITOK
 
 /* TBD: no boot-time tunable support yet */

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#20 (text+ko) ====

@@ -76,27 +76,6 @@
 #include <vm/vm_kern.h>
 #include <kern/kalloc.h>
 
-/*
- * XXX
- * Hack to populate the free list with lots of small allocations.
- * Needed to make non-blocking allocations work early on in the
- * boot sequence.  Otherwise we crash in avc_init().
- * XXX
- */
-void
-sebsd_malloc_init(void)
-{
-	int i;
-	vm_offset_t prealloc[512];
-
-	for (i = 0; i < 512; i++) {
-		if ((prealloc[i] = kalloc(64)) == NULL)
-			break;
-	}
-	while (i--)
-		kfree(prealloc[i], 64);
-}
-
 void *
 sebsd_malloc(size_t size, int flags)
 {
@@ -153,7 +132,6 @@
 {
 	printf("sebsd:: init\n");
 
-	sebsd_malloc_init();
 	avc_init();
 	//sebsd_register_sysctls();
 	if (security_init()) {