[PATCH] unify pfn_to_page: x86_64 pfn_to_page

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

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index f57cc7bd7008e0e6dc4fb1a81d56e1b6710622b2..93830158348e711ad50bc921dec68dd34f649d17 100644 (file)
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -45,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()
@@ -55,8 +53,7 @@ struct hrtimer_base;
 struct hrtimer {
        struct rb_node          node;
        ktime_t                 expires;
-       int                     (*function)(void *);
-       void                    *data;
+       int                     (*function)(struct hrtimer *);
        struct hrtimer_base     *base;
 };