---

yaml --- r: 234628 b: refs/heads/master c: a9e7acf h: refs/heads/master v: v3
git-mirror · Mar 10, 2011 · 35eb025 · 35eb025
1 parent 09605f8
commit 35eb025
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53370d2e8c0382e3e2aa76def93365ed674e7fc7
+refs/heads/master: a9e7acfff0a279792918b7b0de74106e576e9988
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
@@ -680,14 +680,6 @@ static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base)
 	base->hres_active = 0;
 }
 
-/*
- * Initialize the high resolution related parts of a hrtimer
- */
-static inline void hrtimer_init_timer_hres(struct hrtimer *timer)
-{
-}
-
-
 /*
  * When High resolution timers are active, try to reprogram. Note, that in case
  * the state has HRTIMER_STATE_CALLBACK set, no reprogramming and no expiry
@@ -759,7 +751,6 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer,
 	return 0;
 }
 static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { }
-static inline void hrtimer_init_timer_hres(struct hrtimer *timer) { }
 
 #endif /* CONFIG_HIGH_RES_TIMERS */
 
@@ -1141,7 +1132,6 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
 
 	base = hrtimer_clockid_to_base(clock_id);
 	timer->base = &cpu_base->clock_base[base];
-	hrtimer_init_timer_hres(timer);
 	timerqueue_init(&timer->node);
 
 #ifdef CONFIG_TIMER_STATS