From owner-p4-projects@FreeBSD.ORG  Thu Sep 27 09:40:34 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3871216A41B; Thu, 27 Sep 2007 09:40:34 +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 CE8AE16A418
	for <perforce@freebsd.org>; Thu, 27 Sep 2007 09:40:33 +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 C8D5913C45D
	for <perforce@freebsd.org>; Thu, 27 Sep 2007 09:40:33 +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 l8R9eXMD087879
	for <perforce@freebsd.org>; Thu, 27 Sep 2007 09:40:33 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8R9eXD8087876
	for perforce@freebsd.org; Thu, 27 Sep 2007 09:40:33 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Sep 2007 09:40:33 GMT
Message-Id: <200709270940.l8R9eXD8087876@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 126856 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, 27 Sep 2007 09:40:34 -0000

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

Change 126856 by jb@jb_freebsd1 on 2007/09/27 09:40:26

	Remove type references to things that are licensed under the
	CDDL. Not quite as readable, but that's stupid licenses for
	you.

Affected files ...

.. //depot/projects/dtrace/src/sys/sys/linker.h#13 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sys/linker.h#13 (text+ko) ====

@@ -33,7 +33,6 @@
 
 #include <machine/elf.h>
 #include <sys/kobj.h>
-#include <sys/sdt.h>
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_LINKER);
@@ -93,7 +92,7 @@
      */
     int			nenabled;	/* number of enabled probes. */
     int			fbt_nentries;	/* number of fbt entries created. */
-    sdt_probedesc_t	*sdt_probes;
+    void		*sdt_probes;
     int			sdt_nentries;
     size_t		sdt_nprobes;
     size_t		sdt_size;
@@ -264,7 +263,7 @@
 int	elf_reloc_local(linker_file_t _lf, Elf_Addr base, const void *_rel, int _type, elf_lookup_fn _lu);
 const Elf_Sym *elf_get_sym(linker_file_t _lf, Elf_Size _symidx);
 const char *elf_get_symname(linker_file_t _lf, Elf_Size _symidx);
-int sdt_reloc_resolve(uint8_t *, sdt_probedesc_t *);
+int sdt_reloc_resolve(uint8_t *, void *);
 
 int elf_cpu_load_file(linker_file_t);
 int elf_cpu_unload_file(linker_file_t);