Module Name: src
Committed By: snj
Date: Sun Sep 21 17:48:40 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux [netbsd-7]: timer.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/external/bsd/drm2/include/linux/timer.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/timer.h
diff -u src/sys/external/bsd/drm2/include/linux/timer.h:1.4 src/sys/external/bsd/drm2/include/linux/timer.h:1.4.2.1
--- src/sys/external/bsd/drm2/include/linux/timer.h:1.4 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/include/linux/timer.h Sun Sep 21 17:48:40 2014
@@ -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 @@ mod_timer_pinned(struct timer_list *time
}
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.
