[src/trunk]: src/sys/kern Revert rev1.6, it shall return ETIMEDOUT for pthrea...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5689cd9f147
branches:  trunk
changeset: 754293:b5689cd9f147
user:      rmind <rmind%NetBSD.org@localhost>
date:      Mon Apr 26 16:26:11 2010 +0000

description:
Revert rev1.6, it shall return ETIMEDOUT for pthread calls.

diffstat:

 sys/kern/subr_time.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 7d117687ff63 -r b5689cd9f147 sys/kern/subr_time.c
--- a/sys/kern/subr_time.c      Mon Apr 26 15:25:24 2010 +0000
+++ b/sys/kern/subr_time.c      Mon Apr 26 16:26:11 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_time.c,v 1.6 2010/04/23 19:29:23 rmind Exp $      */
+/*     $NetBSD: subr_time.c,v 1.7 2010/04/26 16:26:11 rmind Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.6 2010/04/23 19:29:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_time.c,v 1.7 2010/04/26 16:26:11 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -208,13 +208,13 @@
 
        getnanotime(&tsd);
        timespecsub(ts, &tsd, &tsd);
+       if (tsd.tv_sec < 0 || (tsd.tv_sec == 0 && tsd.tv_nsec <= 0)) {
+               return ETIMEDOUT;
+       }
        error = itimespecfix(&tsd);
        if (error) {
                return error;
        }
-       if (tsd.tv_sec < 0 || (tsd.tv_sec == 0 && tsd.tv_nsec <= 0)) {
-               return ETIMEDOUT;
-       }
        *timo = tstohz(&tsd);
        KASSERT(*timo != 0);