From owner-p4-projects@FreeBSD.ORG  Mon Mar 20 17:49:50 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C8E0D16A423; Mon, 20 Mar 2006 17:49:50 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8EE8016A422
	for <perforce@freebsd.org>; Mon, 20 Mar 2006 17:49:50 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 261BD43D48
	for <perforce@freebsd.org>; Mon, 20 Mar 2006 17:49:50 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KHnoaU027406
	for <perforce@freebsd.org>; Mon, 20 Mar 2006 17:49:50 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KHnnLh027403
	for perforce@freebsd.org; Mon, 20 Mar 2006 17:49:49 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 20 Mar 2006 17:49:49 GMT
Message-Id: <200603201749.k2KHnnLh027403@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93644 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: Mon, 20 Mar 2006 17:49:51 -0000

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

Change 93644 by jhb@jhb_twclab on 2006/03/20 17:48:53

	Use the read_cycle_count() function used for cpu_ticks() for
	get_cycle_count() so that KTR timestamps are monotonic on alpha
	making schedgraph happier.

Affected files ...

.. //depot/projects/smpng/sys/alpha/alpha/clock.c#28 edit
.. //depot/projects/smpng/sys/alpha/include/cpu.h#15 edit

Differences ...

==== //depot/projects/smpng/sys/alpha/alpha/clock.c#28 (text+ko) ====

@@ -137,7 +137,6 @@
 static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc,
     u_int32_t *timer);
 static void set_timer_freq(u_int freq, int intr_freq);
-static uint64_t read_cycle_count(void);
 
 void
 clockattach(device_t dev)

==== //depot/projects/smpng/sys/alpha/include/cpu.h#15 (text+ko) ====

@@ -88,11 +88,12 @@
 
 #define	cpu_getstack(td)	(alpha_pal_rdusp())
 #define	cpu_spinwait()		/* nothing */
-#define	get_cyclecount		alpha_rpcc
+#define	get_cyclecount()	read_cycle_count()
 
 void	cpu_halt(void);
 void	cpu_reset(void);
 void	fork_trampoline(void);					/* MAGIC */
+uint64_t read_cycle_count(void);
 void	swi_vm(void *);
 
 #endif /* _KERNEL */