diff options
| -rw-r--r-- | sys/arch/amd64/amd64/lapic.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/i386/lapic.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/isa/joyreg.h | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/sys/arch/amd64/amd64/lapic.c b/sys/arch/amd64/amd64/lapic.c index 4ea242b074e..a1145435be1 100644 --- a/sys/arch/amd64/amd64/lapic.c +++ b/sys/arch/amd64/amd64/lapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lapic.c,v 1.11 2007/11/16 16:16:07 deraadt Exp $ */ +/* $OpenBSD: lapic.c,v 1.12 2007/11/29 10:53:54 deraadt Exp $ */ /* $NetBSD: lapic.c,v 1.2 2003/05/08 01:04:35 fvdl Exp $ */ /*- @@ -73,7 +73,6 @@ struct evcount clk_count; struct evcount ipi_count; void lapic_delay(int); -void lapic_microtime(struct timeval *); static u_int32_t lapic_gettick(void); void lapic_clockintr(void *, struct intrframe); void lapic_map(paddr_t); @@ -353,7 +352,7 @@ lapic_calibrate_timer(struct cpu_info *ci) /* * Compute fixed-point ratios between cycles and * microseconds to avoid having to do any division - * in lapic_delay and lapic_microtime. + * in lapic_delay. */ tmp = (1000000 * (u_int64_t)1<<32) / lapic_per_second; diff --git a/sys/arch/i386/i386/lapic.c b/sys/arch/i386/i386/lapic.c index bca45e45ba7..6031b1f4f3f 100644 --- a/sys/arch/i386/i386/lapic.c +++ b/sys/arch/i386/i386/lapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lapic.c,v 1.18 2007/09/07 08:37:38 art Exp $ */ +/* $OpenBSD: lapic.c,v 1.19 2007/11/29 10:53:54 deraadt Exp $ */ /* $NetBSD: lapic.c,v 1.1.2.8 2000/02/23 06:10:50 sommerfeld Exp $ */ /*- @@ -69,7 +69,6 @@ struct evcount clk_count; struct evcount ipi_count; void lapic_delay(int); -void lapic_microtime(struct timeval *); static __inline u_int32_t lapic_gettick(void); void lapic_clockintr(void *); void lapic_initclocks(void); @@ -360,7 +359,7 @@ lapic_calibrate_timer(struct cpu_info *ci) /* * Compute fixed-point ratios between cycles and * microseconds to avoid having to do any division - * in lapic_delay and lapic_microtime. + * in lapic_delay. */ tmp = (1000000 * (u_int64_t)1 << 32) / lapic_per_second; diff --git a/sys/arch/i386/isa/joyreg.h b/sys/arch/i386/isa/joyreg.h index d069f7ceb46..1c018a1444e 100644 --- a/sys/arch/i386/isa/joyreg.h +++ b/sys/arch/i386/isa/joyreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: joyreg.h,v 1.4 2002/06/02 22:49:59 deraadt Exp $ */ +/* $OpenBSD: joyreg.h,v 1.5 2007/11/29 10:53:54 deraadt Exp $ */ /* $NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $ */ /*- @@ -43,8 +43,7 @@ */ /* - * The formulae below only work if u is ``not too large''. See also - * the discussion in microtime.s + * The formulae below only work if u is ``not too large''. */ #define USEC2TICKS(u) (((u) * 19549) >> 14) #define TICKS2USEC(u) (((u) * 3433) >> 12) |