diff options
author | jhb <jhb@FreeBSD.org> | 2006-03-28 21:20:12 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2006-03-28 21:20:12 +0000 |
commit | 1e32aa137d72d99922585b4ac33609aa1a09b782 (patch) | |
tree | e5c2cdc02b24d7be4be1745b2627ff811b41d8cb /sys/alpha | |
parent | 776daae39d7c849bb2d52939910c656ef0a0ba13 (diff) | |
download | FreeBSD-src-1e32aa137d72d99922585b4ac33609aa1a09b782.zip FreeBSD-src-1e32aa137d72d99922585b4ac33609aa1a09b782.tar.gz |
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)
Diffstat (limited to 'sys/alpha')
-rw-r--r-- | sys/alpha/alpha/clock.c | 1 | ||||
-rw-r--r-- | 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 6d24a31..500dde2 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 a7a6a94..92a6a4e 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 */ |