From owner-svn-src-all@FreeBSD.ORG Sun May 15 08:24:27 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 6482E106566B;
Sun, 15 May 2011 08:24:27 +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 395018FC0C;
Sun, 15 May 2011 08:24:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4F8ORhA030413;
Sun, 15 May 2011 08:24:27 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4F8ORs8030410;
Sun, 15 May 2011 08:24:27 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201105150824.p4F8ORs8030410@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 15 May 2011 08:24:27 +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: r221948 - in stable/7/sys/cddl/dev/dtrace: amd64 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 "
user" and " projects" \)" <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: Sun, 15 May 2011 08:24:27 -0000
Author: avg
Date: Sun May 15 08:24:26 2011
New Revision: 221948
URL: http://svn.freebsd.org/changeset/base/221948
Log:
MFC r221740: dtrace: remove unused code
Modified:
stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.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/dtrace/amd64/dtrace_subr.c
==============================================================================
--- stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Sun May 15 08:17:09 2011 (r221947)
+++ stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Sun May 15 08:24:26 2011 (r221948)
@@ -359,26 +359,6 @@ static uint64_t nsec_scale;
#define SCALE_SHIFT 28
static void
-dtrace_gethrtime_init_sync(void *arg)
-{
-#ifdef CHECK_SYNC
- /*
- * Delay this function from returning on one
- * of the CPUs to check that the synchronisation
- * works.
- */
- uintptr_t cpu = (uintptr_t) arg;
-
- if (cpu == curcpu) {
- int i;
- for (i = 0; i < 1000000000; i++)
- tgt_cpu_tsc = rdtsc();
- tgt_cpu_tsc = 0;
- }
-#endif
-}
-
-static void
dtrace_gethrtime_init_cpu(void *arg)
{
uintptr_t cpu = (uintptr_t) arg;
@@ -437,7 +417,7 @@ dtrace_gethrtime_init(void *arg)
map |= (1 << curcpu);
map |= (1 << i);
- smp_rendezvous_cpus(map, dtrace_gethrtime_init_sync,
+ smp_rendezvous_cpus(map, NULL,
dtrace_gethrtime_init_cpu,
smp_no_rendevous_barrier, (void *)(uintptr_t) i);
Modified: stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c
==============================================================================
--- stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c Sun May 15 08:17:09 2011 (r221947)
+++ stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c Sun May 15 08:24:26 2011 (r221948)
@@ -359,26 +359,6 @@ static uint64_t nsec_scale;
#define SCALE_SHIFT 28
static void
-dtrace_gethrtime_init_sync(void *arg)
-{
-#ifdef CHECK_SYNC
- /*
- * Delay this function from returning on one
- * of the CPUs to check that the synchronisation
- * works.
- */
- uintptr_t cpu = (uintptr_t) arg;
-
- if (cpu == curcpu) {
- int i;
- for (i = 0; i < 1000000000; i++)
- tgt_cpu_tsc = rdtsc();
- tgt_cpu_tsc = 0;
- }
-#endif
-}
-
-static void
dtrace_gethrtime_init_cpu(void *arg)
{
uintptr_t cpu = (uintptr_t) arg;
@@ -437,7 +417,7 @@ dtrace_gethrtime_init(void *arg)
map |= (1 << curcpu);
map |= (1 << i);
- smp_rendezvous_cpus(map, dtrace_gethrtime_init_sync,
+ smp_rendezvous_cpus(map, NULL,
dtrace_gethrtime_init_cpu,
smp_no_rendevous_barrier, (void *)(uintptr_t) i);