From owner-p4-projects@FreeBSD.ORG  Thu Oct 20 20:41:08 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 9575316A422; Thu, 20 Oct 2005 20:41:06 +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 49A7716A420
	for <perforce@freebsd.org>; Thu, 20 Oct 2005 20:41:06 +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 CAD0D43D83
	for <perforce@freebsd.org>; Thu, 20 Oct 2005 20:41:01 +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 j9KKf1Xs024663
	for <perforce@freebsd.org>; Thu, 20 Oct 2005 20:41:01 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9KKf1a0024660
	for perforce@freebsd.org; Thu, 20 Oct 2005 20:41:01 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 20 Oct 2005 20:41:01 GMT
Message-Id: <200510202041.j9KKf1a0024660@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 85619 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, 20 Oct 2005 20:41:08 -0000

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

Change 85619 by millert@millert_ibook on 2005/10/20 20:40:53

	GFP_ATOMIC should really be defined as M_NOWAIT but this causes
	a panic in the zone allocator from avc_init().  Make it M_WAITOK
	for now and document the problem.  Since sebsd_malloc() didn't
	honor M_WAITOK before, this effectively changes things back to
	the way they were, but hopefully in a less confusing manner.
	We may need to investigate using a lower level allocator here.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/linux-compat.h#5 edit

Differences ...

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

@@ -136,8 +136,9 @@
 #define kmalloc(size,flags) sebsd_ss_malloc(size, flags)
 #define kfree(v) sebsd_ss_free(v)
 #define __get_free_page(flags) sebsd_ss_malloc(PAGE_SIZE, flags) 
-#define GFP_ATOMIC  M_NOWAIT
-#define GFP_KERNEL  M_NOWAIT
+/* XXX - GFP_ATOMIC should be M_NOWAIT but zone alloc chokes in avc init */
+#define GFP_ATOMIC  M_WAITOK
+#define GFP_KERNEL  M_WAITOK
 
 #ifdef __APPLE__
 /* TBD: Skip this for now: */