[src/netbsd-7]: src/sys/external/bsd/drm2/include/linux Pull up following rev...

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

details:   https://anonhg.NetBSD.org/src/rev/6689eef93fcb
branches:  netbsd-7
changeset: 798536:6689eef93fcb
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Nov 11 09:09:32 2014 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #198):
        sys/external/bsd/drm2/include/linux/sched.h: revision 1.5
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 bf2ac813ce03 -r 6689eef93fcb sys/external/bsd/drm2/include/linux/sched.h
--- a/sys/external/bsd/drm2/include/linux/sched.h       Tue Nov 11 09:06:32 2014 +0000
+++ b/sys/external/bsd/drm2/include/linux/sched.h       Tue Nov 11 09:09:32 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sched.h,v 1.3.2.1 2014/10/30 09:20:47 martin Exp $     */
+/*     $NetBSD: sched.h,v 1.3.2.2 2014/11/11 09:09:32 martin 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_ */