[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/f770f721a0ca
branches:  netbsd-7
changeset: 798470:f770f721a0ca
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 30 09:20:47 2014 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #161):
        sys/external/bsd/drm2/include/linux/sched.h: revision 1.4
Don't call kpause(9) if cold.

diffstat:

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

diffs (28 lines):

diff -r f6647a055f3f -r f770f721a0ca sys/external/bsd/drm2/include/linux/sched.h
--- a/sys/external/bsd/drm2/include/linux/sched.h       Mon Oct 27 13:43:43 2014 +0000
+++ b/sys/external/bsd/drm2/include/linux/sched.h       Thu Oct 30 09:20:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sched.h,v 1.3 2014/07/16 20:56:25 riastradh Exp $      */
+/*     $NetBSD: sched.h,v 1.3.2.1 2014/10/30 09:20:47 martin Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -51,12 +51,17 @@
 {
        int start, end;
 
+       if (cold) {
+               DELAY(timeout);
+               return 0;
+       }
+
        start = hardclock_ticks;
        /* XXX Integer truncation...not likely to matter here.  */
        (void)kpause("loonix", false /*!intr*/, timeout, NULL);
        end = hardclock_ticks;
 
-       return (end - start);
+       return (end - start) > 0 ? (end - start) : 0;
 }
 
 #endif  /* _LINUX_SCHED_H_ */