d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a mismerge of i386 rev 1.209

Browse Source
This commit is contained in:
Peter Wemm 2005-03-11 21:57:38 +00:00
parent 639ac97a88
commit 8e93ce1a1b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/amd64/isa/clock.c
View File

@ -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;
}