From owner-svn-src-stable-7@FreeBSD.ORG  Thu Jul  9 14:53:05 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C54C1106567C;
	Thu,  9 Jul 2009 14:53:05 +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 B2C518FC21;
	Thu,  9 Jul 2009 14:53:05 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n69Er5aO088220;
	Thu, 9 Jul 2009 14:53:05 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n69Er5iF088218;
	Thu, 9 Jul 2009 14:53:05 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <200907091453.n69Er5iF088218@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Thu, 9 Jul 2009 14:53:05 +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: r195493 - stable/7/sys/amd64/amd64
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jul 2009 14:53:06 -0000

Author: avg
Date: Thu Jul  9 14:53:05 2009
New Revision: 195493
URL: http://svn.freebsd.org/changeset/base/195493

Log:
  dtrace/amd64: remove duplicate definition of dtrace_gethrtime function
  
  Primary (and enhanced) definition of this function is in
  sys/cddl/dev/dtrace/amd64/dtrace_subr.c.
  
  This is a direct commit to the branch, because this instance of the
  function was added to the branch in rev 182231, which claimed to be
  dtrace MFH, but in fact the code in question never existed in head.
  And does not exist now.
  
  Another reason for this de-duplication is that there is only one instance
  of this function for i386 arch.
  
  Briefly discussed with:	jhb
  Silence from:		jb

Modified:
  stable/7/sys/amd64/amd64/tsc.c

Modified: stable/7/sys/amd64/amd64/tsc.c
==============================================================================
--- stable/7/sys/amd64/amd64/tsc.c	Thu Jul  9 13:48:06 2009	(r195492)
+++ stable/7/sys/amd64/amd64/tsc.c	Thu Jul  9 14:53:05 2009	(r195493)
@@ -234,18 +234,3 @@ tsc_get_timecount(struct timecounter *tc
 {
 	return (rdtsc());
 }
-
-#ifdef KDTRACE_HOOKS
-/*
- * DTrace needs a high resolution time function which can
- * be called from a probe context and guaranteed not to have
- * instrumented with probes itself.
- *
- * Returns nanoseconds since boot.
- */
-uint64_t
-dtrace_gethrtime()
-{
-	return (rdtsc() * (uint64_t) 1000000000 / tsc_freq);
-}
-#endif