diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-05-01 01:36:38 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-05-01 01:36:38 +0200 |
| commit | 19f1b044cd7fa9521be2dfba6bd74d07328ebb2b (patch) | |
| tree | 82607263b8d98911055c187cde71df4b03e1abab | |
| parent | 1afa200c3d5d8f907a67c71c03bc3fd07d838276 (diff) | |
| parent | 806b9d586873b1815887946c6b8a0aae1fe267b8 (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
| -rw-r--r-- | pfinet/timer-emul.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pfinet/timer-emul.c b/pfinet/timer-emul.c index 5a503597..f6760d7e 100644 --- a/pfinet/timer-emul.c +++ b/pfinet/timer-emul.c @@ -51,7 +51,7 @@ timer_function (void *this_is_a_pointless_variable_with_a_rather_long_name) if (!timers) wait = -1; - else if (timers->expires < jiff) + else if (timers->expires <= jiff) wait = 0; else wait = ((timers->expires - jiff) * 1000) / HZ; @@ -64,7 +64,7 @@ timer_function (void *this_is_a_pointless_variable_with_a_rather_long_name) pthread_mutex_lock (&global_lock); - while (timers->expires < jiffies) + while (timers->expires <= jiffies) { struct timer_list *tp; |