From 40ad471f8eb1008fbcba0cd8024addb124d3218e Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 28 Mar 2006 21:20:12 +0000 Subject: [PATCH] Use the read_cycle_count() function recently added for cpu_ticks() for get_cyclecount() as that results in a saner value and makes schedgraph much happier on Alpha. (schedgraph doesn't handle the fact that the counters are out of sync though) --- sys/alpha/alpha/clock.c | 1 - sys/alpha/include/cpu.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/alpha/alpha/clock.c b/sys/alpha/alpha/clock.c index 6d24a314e66..500dde2e476 100644 --- a/sys/alpha/alpha/clock.c +++ b/sys/alpha/alpha/clock.c @@ -137,7 +137,6 @@ static u_char timer2_state; 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) diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h index a7a6a94701b..92a6a4e6f6e 100644 --- a/sys/alpha/include/cpu.h +++ b/sys/alpha/include/cpu.h @@ -88,11 +88,12 @@ extern char etext[]; #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 */