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

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

details:   https://anonhg.NetBSD.org/src/rev/6b637d9bd45e
branches:  netbsd-7
changeset: 798353:6b637d9bd45e
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Sep 21 17:48:40 2014 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #96):
        sys/external/bsd/drm2/include/linux/timer.h: revision 1.5
Add Linux timer_pending and del_timer.

diffstat:

 sys/external/bsd/drm2/include/linux/timer.h |  16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 0508fd36da5a -r 6b637d9bd45e sys/external/bsd/drm2/include/linux/timer.h
--- a/sys/external/bsd/drm2/include/linux/timer.h       Sun Sep 21 17:41:52 2014 +0000
+++ b/sys/external/bsd/drm2/include/linux/timer.h       Sun Sep 21 17:48:40 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: timer.h,v 1.4 2014/07/16 20:56:25 riastradh Exp $      */
+/*     $NetBSD: timer.h,v 1.4.2.1 2014/09/21 17:48:40 snj Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -83,12 +83,26 @@
 }
 
 static inline void
+del_timer(struct timer_list *timer)
+{
+
+       callout_stop(&timer->tl_callout);
+}
+
+static inline void
 del_timer_sync(struct timer_list *timer)
 {
 
        callout_halt(&timer->tl_callout, NULL);
 }
 
+static inline bool
+timer_pending(struct timer_list *timer)
+{
+
+       return callout_pending(&timer->tl_callout);
+}
+
 /*
  * XXX This is bogus -- the Linux version does various machinations to
  * give some jitter so that stuff doesn't wake up all at once.