Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix hang at 4B microseconds (1h12 or so), and simplify part of the previous

This commit is contained in:
mrg 2018-01-12 09:47:44 +00:00
parent 7e24d946f2
commit c0b6dc1bfc
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/arch/sparc/sparc/timer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: timer.c,v 1.33 2018/01/12 06:01:33 mrg Exp $ */ /* $NetBSD: timer.c,v 1.34 2018/01/12 09:47:44 mrg Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -60,7 +60,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.33 2018/01/12 06:01:33 mrg Exp $"); __KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.34 2018/01/12 09:47:44 mrg Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@ -162,17 +162,11 @@ timer_get_timecount(struct timecounter *tc)
/* /*
* This handles early-boot cases where the counter resets twice * This handles early-boot cases where the counter resets twice
* before the offset is updated. * before the offset is updated, and we have a stupid check to
* ensure overflow hasn't happened.
*/ */
if (res < cntr.lastres) { if (res < cntr.lastres && res > (TMR_MASK+1) << 3)
if (fixup == 0) res = cntr.lastres + 1;
fixup = cntr.limit;
while (res < cntr.lastres) {
if (res > UINT_MAX - fixup)
break;
res += fixup;
}
}
cntr.lastres = res; cntr.lastres = res;