39c39
< * $Id: sys_generic.c,v 1.32 1997/11/06 19:29:20 phk Exp $
---
> * $Id: sys_generic.c,v 1.33 1997/11/23 10:30:50 bde Exp $
542c542
< int s, ncoll, error, timo;
---
> int s, ncoll, error, timo, term;
603,606c603
< s = splclock();
< timevaladd(&atv, &time);
< timo = hzto(&atv);
< splx(s);
---
> timo = tvtohz(&atv);
608a606,607
> if (timo)
> term = timo + ticks;
616,618c615
< /* this should be timercmp(&time, &atv, >=) */
< if (uap->tv && (time.tv_sec > atv.tv_sec ||
< (time.tv_sec == atv.tv_sec && time.tv_usec >= atv.tv_usec))) {
---
> if (timo && term <= ticks) {
709c706
< int s, ncoll, error = 0, timo;
---
> int s, ncoll, error = 0, timo, term;
731,734c728
< s = splclock();
< timevaladd(&atv, &time);
< timo = hzto(&atv);
< splx(s);
---
> timo = tvtohz(&atv);
736a731,732
> if (timo)
> term = timo + ticks;
743,744c739,740
< s = splhigh();
< if (timo && timercmp(&time, &atv, >=)) {
---
> s = splhigh();
> if (timo && term <= ticks) {