Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / linux / hrtimer.h

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 4fc379d..306acf1 100644 (file)
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -40,6 +40,7 @@ struct hrtimer_base;
 
 /**
  * struct hrtimer - the basic hrtimer structure
+ *
  * @node:      red black tree node for time ordered insertion
  * @expires:   the absolute expiry time in the hrtimers internal
  *             representation. The time is related to the clock on
@@ -58,6 +59,7 @@ struct hrtimer {
 
 /**
  * struct hrtimer_sleeper - simple sleeper structure
+ *
  * @timer:     embedded timer structure
  * @task:      task to wake up
  *
@@ -70,6 +72,7 @@ struct hrtimer_sleeper {
 
 /**
  * struct hrtimer_base - the timer base for a specific clock
+ *
  * @index:             clock type index for per_cpu support when moving a timer
  *                     to a base on another cpu.
  * @lock:              lock protecting the base and associated timers
@@ -80,7 +83,6 @@ struct hrtimer_sleeper {
  * @get_softirq_time:  function to retrieve the current time from the softirq
  * @curr_timer:                the timer which is executing a callback right now
  * @softirq_time:      the time when running the hrtimer queue in the softirq
- * @lock_key:          the lock_class_key for use with lockdep
  */
 struct hrtimer_base {
        clockid_t               index;
@@ -92,7 +94,6 @@ struct hrtimer_base {
        ktime_t                 (*get_softirq_time)(void);
        struct hrtimer          *curr_timer;
        ktime_t                 softirq_time;
-       struct lock_class_key lock_key;
 };
 
 /*
@@ -126,7 +127,7 @@ extern ktime_t hrtimer_get_next_event(void);
 
 static inline int hrtimer_active(const struct hrtimer *timer)
 {
-       return rb_parent(&timer->node) != &timer->node;
+       return timer->node.rb_parent != HRTIMER_INACTIVE;
 }
 
 /* Forward a hrtimer so it expires after now: */