From 989b0a8843f48e1c023ce3d25778b8ad968e9686 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 11 Mar 2005 21:57:38 +0000 Subject: Fix a mismerge of i386 rev 1.209 --- sys/amd64/isa/clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/amd64/isa') diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index d4bf576..a2f3e2f 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -829,7 +829,7 @@ i8254_get_timecount(struct timecounter *tc) if (count < i8254_lastcount || (!i8254_ticked && (clkintr_pending || ((count < 20 || (!(rflags & PSL_I) && count < timer0_max_count / 2u)) && - i8254_intsrc != NULL && i8254_pending(i8254_intsrc))))) { + i8254_pending != NULL && i8254_pending(i8254_intsrc))))) { i8254_ticked = 1; i8254_offset += timer0_max_count; } -- cgit v1.1