Pull novell-bugzilla-156426 into release branch

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

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 64e2754ca7342614c156e64d230573f29a5616eb..306acf1dc6d58b54aef407d2ab9e370ff18eaa99 100644 (file)
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -34,15 +34,7 @@ enum hrtimer_restart {
        HRTIMER_RESTART,
 };
 
-/*
- * Timer states:
- */
-enum hrtimer_state {
-       HRTIMER_INACTIVE,       /* Timer is inactive */
-       HRTIMER_EXPIRED,                /* Timer is expired */
-       HRTIMER_RUNNING,                /* Timer is running the callback function */
-       HRTIMER_PENDING,                /* Timer is pending */
-};
+#define HRTIMER_INACTIVE       ((void *)1UL)
 
 struct hrtimer_base;
 
@@ -53,9 +45,7 @@ struct hrtimer_base;
  * @expires:   the absolute expiry time in the hrtimers internal
  *             representation. The time is related to the clock on
  *             which the timer is based.
- * @state:     state of the timer
  * @function:  timer expiry callback function
- * @data:      argument for the callback function
  * @base:      pointer to the timer base (per cpu and per clock)
  *
  * The hrtimer structure must be initialized by init_hrtimer_#CLOCKTYPE()
@@ -63,12 +53,23 @@ struct hrtimer_base;
 struct hrtimer {
        struct rb_node          node;
        ktime_t                 expires;
-       enum hrtimer_state      state;
-       int                     (*function)(void *);
-       void                    *data;
+       int                     (*function)(struct hrtimer *);
        struct hrtimer_base     *base;
 };
 
+/**
+ * struct hrtimer_sleeper - simple sleeper structure
+ *
+ * @timer:     embedded timer structure
+ * @task:      task to wake up
+ *
+ * task is set to NULL, when the timer expires.
+ */
+struct hrtimer_sleeper {
+       struct hrtimer timer;
+       struct task_struct *task;
+};
+
 /**
  * struct hrtimer_base - the timer base for a specific clock
  *
@@ -79,7 +80,7 @@ struct hrtimer {
  * @first:             pointer to the timer node which expires first
  * @resolution:                the resolution of the clock, in nanoseconds
  * @get_time:          function to retrieve the current time of the clock
- * @get_sofirq_time:   function to retrieve the current time from the softirq
+ * @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
  */
@@ -126,11 +127,12 @@ extern ktime_t hrtimer_get_next_event(void);
 
 static inline int hrtimer_active(const struct hrtimer *timer)
 {
-       return timer->state == HRTIMER_PENDING;
+       return timer->node.rb_parent != HRTIMER_INACTIVE;
 }
 
 /* Forward a hrtimer so it expires after now: */
-extern unsigned long hrtimer_forward(struct hrtimer *timer, ktime_t interval);
+extern unsigned long
+hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);
 
 /* Precise sleep: */
 extern long hrtimer_nanosleep(struct timespec *rqtp,
@@ -138,6 +140,9 @@ extern long hrtimer_nanosleep(struct timespec *rqtp,
                              const enum hrtimer_mode mode,
                              const clockid_t clockid);
 
+extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
+                                struct task_struct *tsk);
+
 /* Soft interrupt function to run the hrtimer queues: */
 extern void hrtimer_run_queues(void);