Merge "timer: Remove a BUG_ON check in migrates timers" into msm-4.14

kernel/time/timer.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1904,8 +1904,6 @@ static void __migrate_timers(unsigned int cpu, bool remove_pinned)
		*/
		forward_timer_base(new_base);

		BUG_ON(old_base->running_timer);

		for (i = 0; i < WHEEL_SIZE; i++)
		migrate_timer_list(new_base, old_base->vectors + i,
		remove_pinned);