PERFORCE change 93644 for review

[John Baldwin]

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

Change 93644 by jhb at 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 */