1 files changed, 2 insertions, 8 deletions

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 2f245fe63bda..9a4e35cd5f79 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -125,12 +125,12 @@ struct hrtimer {
         enum hrtimer_restart            (*function)(struct hrtimer *);
         struct hrtimer_clock_base       *base;
         unsigned long                   state;
-        enum hrtimer_cb_mode            cb_mode;
         struct list_head                cb_entry;
+        enum hrtimer_cb_mode            cb_mode;
 #ifdef CONFIG_TIMER_STATS
+        int                             start_pid;
         void                            *start_site;
         char                            start_comm[16];
-        int                             start_pid;
 #endif
 };
 
@@ -155,10 +155,8 @@ struct hrtimer_sleeper {
  * @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_softirq_time:   function to retrieve the current time from the softirq
  * @softirq_time:       the time when running the hrtimer queue in the softirq
  * @offset:             offset of this clock to the monotonic base
- * @reprogram:          function to reprogram the timer event
  */
 struct hrtimer_clock_base {
         struct hrtimer_cpu_base *cpu_base;
@@ -167,13 +165,9 @@ struct hrtimer_clock_base {
         struct rb_node          *first;
         ktime_t                 resolution;
         ktime_t                 (*get_time)(void);
-        ktime_t                 (*get_softirq_time)(void);
         ktime_t                 softirq_time;
 #ifdef CONFIG_HIGH_RES_TIMERS
         ktime_t                 offset;
-        int                     (*reprogram)(struct hrtimer *t,
-                                             struct hrtimer_clock_base *b,
-                                             ktime_t n);
 #endif
 };