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.

3 files changed, 2 insertions, 9 deletions

diff --git a/sys/ia64/ia64/clock.c b/sys/ia64/ia64/clock.c
index c3615bf5438a..06c96c33fa27 100644
--- a/sys/ia64/ia64/clock.c
+++ b/sys/ia64/ia64/clock.c
@@ -254,13 +254,6 @@ fail:
 }
 #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 cb051a926e9e..d59b4bcdec80 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 08892398ffbc..65673c086b53 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