Sun Sep 21 17:48:40 2014 UTC ()

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.


(snj)

diff -r1.4 -r1.4.2.1 src/sys/external/bsd/drm2/include/linux/timer.h

--- src/sys/external/bsd/drm2/include/linux/timer.h 2014/07/16 20:56:25	1.4
+++ src/sys/external/bsd/drm2/include/linux/timer.h 2014/09/21 17:48:40	1.4.2.1

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -73,32 +73,46 @@ mod_timer(struct timer_list *timer, unsi
 	callout_schedule(&timer->tl_callout, (now < then? (then - now) : 0));
+}
 static inline void
 mod_timer_pinned(struct timer_list *timer, unsigned long then)
+{
 	/* XXX Stay on the same CPU it was originally on...  */
 	mod_timer(timer, then);
+}
 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.
  */
 static inline unsigned long
 round_jiffies_up(unsigned long j)
+{
 	return roundup(j, hz);
+}
 static inline unsigned long
 round_jiffies_up_relative(unsigned long j)