From de09ec92e6a7d9ef8a19d57ce7da4d75f535ef68 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Mon, 6 Jan 2003 00:38:35 +0000 Subject: [PATCH] Manually inline handleclock(). There's only a single caller and handleclock itself is trivial. While here, replace (itc_frequency+hz/2)/hz with itm_reload for consistency. There's now a single place where we determine the ITM reload value. --- sys/ia64/ia64/clock.c | 7 ------- sys/ia64/ia64/interrupt.c | 3 ++- sys/ia64/include/clock.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/ia64/ia64/clock.c b/sys/ia64/ia64/clock.c index c3615bf5438..06c96c33fa2 100644 --- a/sys/ia64/ia64/clock.c +++ b/sys/ia64/ia64/clock.c @@ -254,13 +254,6 @@ calibrate_clocks(u_int32_t firmware_freq) } #endif -void -handleclock(void* arg) -{ - ia64_set_itm(ia64_get_itc() + (itc_frequency + hz/2) / hz); - hardclock(arg); -} - /* * We assume newhz is either stathz or profhz, and that neither will * change after being set up above. Could recalculate intervals here diff --git a/sys/ia64/ia64/interrupt.c b/sys/ia64/ia64/interrupt.c index cb051a926e9..d59b4bcdec8 100644 --- a/sys/ia64/ia64/interrupt.c +++ b/sys/ia64/ia64/interrupt.c @@ -128,7 +128,8 @@ interrupt(u_int64_t vector, struct trapframe *framep) /* Only the BSP runs the real clock */ if (PCPU_GET(cpuid) == 0) { #endif - handleclock(framep); + ia64_set_itm(ia64_get_itc() + itm_reload); + hardclock((struct clockframe *)framep); /* divide hz (1024) by 8 to get stathz (128) */ if ((++schedclk2 & 0x7) == 0) statclock((struct clockframe *)framep); diff --git a/sys/ia64/include/clock.h b/sys/ia64/include/clock.h index 08892398ffb..65673c086b5 100644 --- a/sys/ia64/include/clock.h +++ b/sys/ia64/include/clock.h @@ -21,7 +21,6 @@ extern u_int64_t itm_reload; int sysbeep(int pitch, int period); int acquire_timer2(int mode); int release_timer2(void); -void handleclock(void *arg); #endif -- 2.45.2