diff options
| author | peter <peter@FreeBSD.org> | 2005-03-11 21:57:38 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2005-03-11 21:57:38 +0000 |
| commit | 989b0a8843f48e1c023ce3d25778b8ad968e9686 (patch) | |
| tree | f7b5a74203c5878addbabb16fb865b5e05062848 /sys/amd64/isa | |
| parent | 31049ced0105eeeb90fcd2225be46e482e005a4d (diff) | |
| download | FreeBSD-src-989b0a8843f48e1c023ce3d25778b8ad968e9686.zip FreeBSD-src-989b0a8843f48e1c023ce3d25778b8ad968e9686.tar.gz | |
Fix a mismerge of i386 rev 1.209
Diffstat (limited to 'sys/amd64/isa')
| -rw-r--r-- | sys/amd64/isa/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |
