mm: have zonelist contains structs with both a zone pointer and zone_idx

[deliverable/linux.git] / kernel / hrtimer.c

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 70d4adc74639f56b039f0dcfdacd7eda284784da..f78777abe769e1e3608b8f751d1c996f05aeea13 100644 (file)
--- a/kernel/hrtimer.c
+++ b/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)) {