[src/trunk]: src/sys/external/bsd/drm2/include/linux return correct remaining...

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

details:   https://anonhg.NetBSD.org/src/rev/ee22c76ec3d9
branches:  trunk
changeset: 333560:ee22c76ec3d9
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Sat Nov 08 19:27:40 2014 +0000

description:
return correct remaining jiffies.
fix X server hang when screen blank by DPMS.

diffstat:

 sys/external/bsd/drm2/include/linux/sched.h |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 505268e39eb2 -r ee22c76ec3d9 sys/external/bsd/drm2/include/linux/sched.h
--- a/sys/external/bsd/drm2/include/linux/sched.h       Sat Nov 08 17:21:51 2014 +0000
+++ b/sys/external/bsd/drm2/include/linux/sched.h       Sat Nov 08 19:27:40 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sched.h,v 1.4 2014/10/22 11:41:34 nonaka Exp $ */
+/*     $NetBSD: sched.h,v 1.5 2014/11/08 19:27:40 nonaka Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -49,6 +49,7 @@
 static inline long
 schedule_timeout_uninterruptible(long timeout)
 {
+       long remain;
        int start, end;
 
        if (cold) {
@@ -61,7 +62,8 @@
        (void)kpause("loonix", false /*!intr*/, timeout, NULL);
        end = hardclock_ticks;
 
-       return (end - start) > 0 ? (end - start) : 0;
+       remain = timeout - (end - start);
+       return remain > 0 ? remain : 0;
 }
 
 #endif  /* _LINUX_SCHED_H_ */