Merge "hrtimer: Reset hrtimer cpu base proper on CPU hotplug" (07866af9) · Commits · e / devices / android_kernel_sony_msm8998

kernel/time/hrtimer.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -669,7 +669,9 @@ static void 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;
		base->next_timer = NULL;
		}

		/*
		@@ -1587,6 +1589,7 @@ static void init_hrtimers_cpu(int cpu)
		timerqueue_init_head(&cpu_base->clock_base[i].active);
		}

		cpu_base->active_bases = 0;
		cpu_base->cpu = cpu;
		hrtimer_init_hres(cpu_base);
		}