From owner-p4-projects@FreeBSD.ORG  Sun Apr 23 23:02:15 2006
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 C8A2616A403; Sun, 23 Apr 2006 23:02:15 +0000 (UTC)
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 9032416A400
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 23:02:15 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6FC8043D49
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 23:02:14 +0000 (GMT)
	(envelope-from jb@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 k3NN2ETr043278
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 23:02:14 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3NN2E3U043270
	for perforce@freebsd.org; Sun, 23 Apr 2006 23:02:14 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 23 Apr 2006 23:02:14 GMT
Message-Id: <200604232302.k3NN2E3U043270@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 95958 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: Sun, 23 Apr 2006 23:02:16 -0000

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

Change 95958 by jb@jb_freebsd2 on 2006/04/23 23:01:28

	Don't try to un-const-ise a string. gcc really does like that.
	
	There is a mismatch between the type we use for curthread. Just
	comment that out for now.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_util.c#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_util.c#3 (text+ko) ====

@@ -84,12 +84,14 @@
 static void
 dtrace_errdebug(const char *str)
 {
-	int hval = dtrace_hash_str((char *)str) % DTRACE_ERRHASHSZ;
+	int hval = dtrace_hash_str(str) % DTRACE_ERRHASHSZ;
 	int occupied = 0;
 
 	mutex_enter(&dtrace_errlock);
 	dtrace_errlast = str;
+#if defined(sun)
 	dtrace_errthread = curthread;
+#endif
 
 	while (occupied++ < DTRACE_ERRHASHSZ) {
 		if (dtrace_errhash[hval].dter_msg == str) {