From: Ben Gras <ben@minix3.org>
Date: Fri, 4 Jun 2010 11:06:44 +0000 (+0000)
Subject: from trunk:
X-Git-Tag: v3.1.7~6
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=7dc782dd1ac941dedf883acfa9e69f36fc53e181;p=minix.git

from trunk:
------------------------------------------------------------------------
r7154 | thruby | 2010-06-04 10:54:43 +0000 (Fri, 04 Jun 2010) | 1 line

Removed a buggy assert unintentionally commted in r7044
---

diff --git a/kernel/system/do_setalarm.c b/kernel/system/do_setalarm.c
index d28007a81..313a735a2 100644
--- a/kernel/system/do_setalarm.c
+++ b/kernel/system/do_setalarm.c
@@ -50,7 +50,6 @@ PUBLIC int do_setalarm(struct proc * caller, message * m_ptr)
       reset_timer(tp);
   } else {
       tp->tmr_exp_time = (use_abs_time) ? exp_time : exp_time + get_uptime();
-      assert(tp->tmr_exp_time > get_uptime());
       set_timer(tp, tp->tmr_exp_time, tp->tmr_func);
   }
   return(OK);