From 4df6728951c7d28013a07bf1ef88c608e23943f6 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Fri, 19 Sep 2008 13:13:44 +0100
Subject: [PATCH] --- yaml --- r: 116341 b: refs/heads/master c:
 d7cfb60c5cf904ecf1e0ae23ec178175b86f0d4a h: refs/heads/master i:   116339:
 7739b63e3978f4d37d07c0c0b44cc0a20f0873bb v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hrtimer.h | 2 --
 trunk/kernel/hrtimer.c        | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 40ab51efe91b..52aa62f23b85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d82f0b0f6f1a0a25afc288fb7135b1601fe6df18
+refs/heads/master: d7cfb60c5cf904ecf1e0ae23ec178175b86f0d4a
diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h
index 6d93dce61cbb..1b079bd29c35 100644
--- a/trunk/include/linux/hrtimer.h
+++ b/trunk/include/linux/hrtimer.h
@@ -145,7 +145,6 @@ 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
@@ -157,7 +156,6 @@ 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;
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index 03ea1378c43b..4d761d50c529 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -1401,9 +1401,7 @@ void hrtimer_run_queues(void)
 		if (!base->first)
 			continue;
 
-		if (base->get_softirq_time)
-			base->softirq_time = base->get_softirq_time();
-		else if (gettime) {
+		if (gettime) {
 			hrtimer_get_softirq_time(cpu_base);
 			gettime = 0;
 		}