hrtimer: Reset hrtimer cpu base proper on CPU hotplug

[pandora-kernel.git] / kernel / hrtimer.c

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 6918c03..f3fdd40 100644 (file)
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -657,6 +657,7 @@ static int hrtimer_reprogram(struct hrtimer *timer,
 static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base)
 {
        base->expires_next.tv64 = KTIME_MAX;
+       base->hang_detected = 0;
        base->hres_active = 0;
 }
 
@@ -1702,6 +1703,7 @@ static void __cpuinit init_hrtimers_cpu(int cpu)
                timerqueue_init_head(&cpu_base->clock_base[i].active);
        }
 
+       cpu_base->active_bases = 0;
        hrtimer_init_hres(cpu_base);
 }