From owner-p4-projects@FreeBSD.ORG  Wed Dec 26 22:06:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2160A16A41A; Wed, 26 Dec 2007 22:06:20 +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 C221116A417
	for <perforce@freebsd.org>; Wed, 26 Dec 2007 22:06:19 +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 B799313C448
	for <perforce@freebsd.org>; Wed, 26 Dec 2007 22:06:19 +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 lBQM6JZ3078121
	for <perforce@freebsd.org>; Wed, 26 Dec 2007 22:06:19 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBQM6JgR078117
	for perforce@freebsd.org; Wed, 26 Dec 2007 22:06:19 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 26 Dec 2007 22:06:19 GMT
Message-Id: <200712262206.lBQM6JgR078117@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 131730 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: Wed, 26 Dec 2007 22:06:20 -0000

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

Change 131730 by jb@jb_freebsd1 on 2007/12/26 22:05:36

	Use mp_maxid instead of MAXCPU.
	
	Enable firing the cyclics now with a check that the cyclic has
	actually initialised (cpu_cyclic != NULL).

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#7 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#7 (text+ko) ====

@@ -43,8 +43,10 @@
 	 * that the asserts work. On FreeBSD, if a CPU exists, it is
 	 * enabled.
 	 */
-	for (i = 0; i < MAXCPU; i++)
+	for (i = 0; i <= mp_maxid; i++) {
+		cyclic_cpu[i].cpuid = i;
 		cyclic_cpu[i].cpu_flags &= CPU_ENABLE;
+	}
 
 	/* Initialise the machine-dependent backend. */
 	cyclic_machdep_init();
@@ -78,14 +80,14 @@
 {
 	cpu_t *c = &cyclic_cpu[curcpu];
 
-	c->cpu_intr_actv |= (1 << CY_HIGH_LEVEL);
+	if (c->cpu_cyclic != NULL) {
+		c->cpu_intr_actv |= (1 << CY_HIGH_LEVEL);
 
-#ifdef DOODAD
-	/* Fire any timers that are due. */
-	cyclic_fire(c);
-#endif
+		/* Fire any timers that are due. */
+		cyclic_fire(c);
 
-	c->cpu_intr_actv &= ~(1 << CY_HIGH_LEVEL);
+		c->cpu_intr_actv &= ~(1 << CY_HIGH_LEVEL);
+	}
 }
 
 /* ARGSUSED */