From owner-svn-src-all@FreeBSD.ORG  Fri Mar 11 16:07:20 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A804B1065670;
	Fri, 11 Mar 2011 16:07:20 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 959858FC0A;
	Fri, 11 Mar 2011 16:07:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2BG7Kwx085394;
	Fri, 11 Mar 2011 16:07:20 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BG7Ke6085392;
	Fri, 11 Mar 2011 16:07:20 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201103111607.p2BG7Ke6085392@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 11 Mar 2011 16:07:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219500 - stable/7/sys/cddl/dev/cyclic/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Mar 2011 16:07:20 -0000

Author: avg
Date: Fri Mar 11 16:07:20 2011
New Revision: 219500
URL: http://svn.freebsd.org/changeset/base/219500

Log:
  MFC r216252: opensolaris cyclic xcall: no need for special handling of curcpu

Modified:
  stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
==============================================================================
--- stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Fri Mar 11 16:05:36 2011	(r219499)
+++ stable/7/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Fri Mar 11 16:07:20 2011	(r219500)
@@ -121,13 +121,7 @@ static void reprogram(cyb_arg_t arg, hrt
 
 static void xcall(cyb_arg_t arg, cpu_t *c, cyc_func_t func, void *param)
 {
-	/*
-	 * If the target CPU is the current one, just call the
-	 * function. This covers the non-SMP case.
-	 */
-	if (c == &solaris_cpu[curcpu])
-		(*func)(param);
-	else
-		smp_rendezvous_cpus((cpumask_t) (1 << c->cpuid), NULL,
-		    func, smp_no_rendevous_barrier, param);
+
+	smp_rendezvous_cpus((cpumask_t) (1 << c->cpuid), NULL,
+	    func, smp_no_rendevous_barrier, param);
 }