From 689134d75b4054e1bbbc14cc93efcd34b8ca19bc Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 19 Apr 2008 21:31:26 +0200
Subject: [PATCH] --- yaml --- r: 91338 b: refs/heads/master c:
 259aae864ceeb2b34e7bafa1ce18d096a357fab2 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/hrtimer.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bc7791af26aa..5bd62e96e484 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 833883d9ac4cfb31c1c4419335e68e6895a05b6b
+refs/heads/master: 259aae864ceeb2b34e7bafa1ce18d096a357fab2
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index 70d4adc74639..f78777abe769 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -1254,14 +1254,13 @@ void hrtimer_run_queues(void)
 		if (!base->first)
 			continue;
 
-		if (gettime) {
+		if (base->get_softirq_time)
+			base->softirq_time = base->get_softirq_time();
+		else if (gettime) {
 			hrtimer_get_softirq_time(cpu_base);
 			gettime = 0;
 		}
 
-		if (base->get_softirq_time)
-			base->softirq_time = base->get_softirq_time();
-
 		spin_lock(&cpu_base->lock);
 
 		while ((node = base->first)) {