From owner-p4-projects@FreeBSD.ORG  Sat Dec 22 02:49:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D18116A41A; Sat, 22 Dec 2007 02:49:13 +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 A535516A419
	for <perforce@freebsd.org>; Sat, 22 Dec 2007 02:49:12 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F81013C45A
	for <perforce@freebsd.org>; Sat, 22 Dec 2007 02:49:12 +0000 (UTC)
	(envelope-from jb@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 lBM2nC64096411
	for <perforce@freebsd.org>; Sat, 22 Dec 2007 02:49:12 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBM2nCrE096408
	for perforce@freebsd.org; Sat, 22 Dec 2007 02:49:12 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 22 Dec 2007 02:49:12 GMT
Message-Id: <200712220249.lBM2nCrE096408@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 131404 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, 22 Dec 2007 02:49:13 -0000

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

Change 131404 by jb@jb_freebsd1 on 2007/12/22 02:48:28

	Remove a function prototype that clashes with a FreeBSD header.
	
	This whole file needs to be revised. The way it is coded it is actually
	zfs-specific.
	
	If we are going to have compatibility stuff like this, we need to put
	it in a kernel module of it's own and make the zfs, cyclic and dtrace
	modules depend on that.
	
	I feel like I'm building hacks on top of hacks. Sigh.

Affected files ...

.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 (text+ko) ====

@@ -200,7 +200,6 @@
 }
 
 #ifdef _KERNEL
-extern void zone_drain(uma_zone_t zone);
 void
 kmem_cache_reap_now(kmem_cache_t *cache)
 {