From owner-p4-projects@FreeBSD.ORG  Mon Apr 24 20:23:47 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 39DB516A40F; Mon, 24 Apr 2006 20:23:47 +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 0C27716A402
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 20:23:47 +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 A139543D48
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 20:23:46 +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 k3OKNknK093618
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 20:23:46 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3OKNkKc093606
	for perforce@freebsd.org; Mon, 24 Apr 2006 20:23:46 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 24 Apr 2006 20:23:46 GMT
Message-Id: <200604242023.k3OKNkKc093606@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 96012 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: Mon, 24 Apr 2006 20:23:47 -0000

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

Change 96012 by jb@jb_freebsd2 on 2006/04/24 20:23:32

	Initialise dts_epid on all architectures. Bad things happen if we
	don't do that. Like kaboom.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#4 edit

Differences ...

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

@@ -207,7 +207,6 @@
 	}
 
 	state = ddi_get_soft_state(dtrace_softstate, m);
-	state->dts_epid = DTRACE_EPIDNONE + 1;
 #else
 	/* Allocate memory for the state. */
 	state = malloc(sizeof(dtrace_state_t), M_DTRACE, M_WAITOK | M_ZERO);
@@ -215,6 +214,7 @@
 	/* Save the pointer to the state. */
 	dev->si_drv1 = state;
 #endif
+	state->dts_epid = DTRACE_EPIDNONE + 1;
 
 	(void) snprintf(c, sizeof (c), "dtrace_aggid_%d", m);
 	state->dts_aggid_arena = vmem_create(c, (void *)1, UINT32_MAX, 1,