Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6760aa0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-fixes-for-linus' of... 

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clockevent: Don't remove broadcast device when cpu is dead
parents 90ea3019 ea9d8e3f

kernel/time/clockevents.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -259,7 +259,8 @@ void clockevents_notify(unsigned long reason, void *arg) 
		cpu = *((int *)arg);

		cpu = *((int *)arg);

		list_for_each_entry_safe(dev, tmp, &clockevent_devices, list) {

		list_for_each_entry_safe(dev, tmp, &clockevent_devices, list) {

			if (cpumask_test_cpu(cpu, dev->cpumask) &&

			if (cpumask_test_cpu(cpu, dev->cpumask) &&

			    cpumask_weight(dev->cpumask) == 1) {

			    cpumask_weight(dev->cpumask) == 1 &&

			    !tick_is_broadcast_device(dev)) {

				BUG_ON(dev->mode != CLOCK_EVT_MODE_UNUSED);

				BUG_ON(dev->mode != CLOCK_EVT_MODE_UNUSED);

				list_del(&dev->list);

				list_del(&dev->list);

			}

			}