---

yaml --- r: 91338 b: refs/heads/master c: 259aae8 h: refs/heads/master v: v3
git-mirror · Apr 21, 2008 · 689134d · 689134d
1 parent 18f723d
commit 689134d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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)) {