Module Name: src
Committed By: martin
Date: Tue Nov 11 09:09:33 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux [netbsd-7]: sched.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 \
src/sys/external/bsd/drm2/include/linux/sched.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/sched.h
diff -u src/sys/external/bsd/drm2/include/linux/sched.h:1.3.2.1 src/sys/external/bsd/drm2/include/linux/sched.h:1.3.2.2
--- src/sys/external/bsd/drm2/include/linux/sched.h:1.3.2.1 Thu Oct 30 09:20:47 2014
+++ src/sys/external/bsd/drm2/include/linux/sched.h Tue Nov 11 09:09:32 2014
@@ -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 @@ task_pid_nr(struct proc *p)
static inline long
schedule_timeout_uninterruptible(long timeout)
{
+ long remain;
int start, end;
if (cold) {
@@ -61,7 +62,8 @@ schedule_timeout_uninterruptible(long ti
(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_ */
