From owner-p4-projects@FreeBSD.ORG  Fri Feb  8 06:39:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 848C516A41B; Fri,  8 Feb 2008 06:39:30 +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 4935116A417
	for <perforce@freebsd.org>; Fri,  8 Feb 2008 06:39:30 +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 3D93A13C478
	for <perforce@freebsd.org>; Fri,  8 Feb 2008 06:39:30 +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 m186dUYF095358
	for <perforce@freebsd.org>; Fri, 8 Feb 2008 06:39:30 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m186dURA095351
	for perforce@freebsd.org; Fri, 8 Feb 2008 06:39:30 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 8 Feb 2008 06:39:30 GMT
Message-Id: <200802080639.m186dURA095351@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 135017 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: Fri, 08 Feb 2008 06:39:30 -0000

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

Change 135017 by jb@jb_freebsd1 on 2008/02/08 06:38:38

	Move smp_no_rendevous_barrier outside #ifdef SMP. It was
	coded as though that was the expected compile behaviour.
	I now need it to behave that way so that a kernel module
	built without knowledge of whether or not SMP is defined
	in the kernel will still work in both cases.

Affected files ...

.. //depot/projects/dtrace/src/sys/kern/subr_smp.c#10 edit

Differences ...

==== //depot/projects/dtrace/src/sys/kern/subr_smp.c#10 (text+ko) ====

@@ -290,14 +290,6 @@
 	return 1;
 }
 
-void
-smp_no_rendevous_barrier(void *dummy)
-{
-#ifdef SMP
-	KASSERT((!smp_started),("smp_no_rendevous called and smp is started"));
-#endif
-}
-
 /*
  * All-CPU rendezvous.  CPUs are signalled, all execute the setup function 
  * (if specified), rendezvous, execute the action function (if specified),
@@ -460,3 +452,11 @@
 		teardown_func(arg);
 }
 #endif /* SMP */
+
+void
+smp_no_rendevous_barrier(void *dummy)
+{
+#ifdef SMP
+	KASSERT((!smp_started),("smp_no_rendevous called and smp is started"));
+#endif
+}