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

Commit fec6ed1d 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:
  clockevents: check broadcast tick device not the clock events device
parents b8ec3227 07454bff

kernel/time/tick-broadcast.c

+4 −2
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ static void tick_do_broadcast_on_off(void *why) 
	case CLOCK_EVT_NOTIFY_BROADCAST_FORCE:

		if (!cpu_isset(cpu, tick_broadcast_mask)) {

			cpu_set(cpu, tick_broadcast_mask);

			if (bc->mode == TICKDEV_MODE_PERIODIC)

			if (tick_broadcast_device.mode ==

			    TICKDEV_MODE_PERIODIC)

				clockevents_shutdown(dev);

		}

		if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE)
@@ -245,7 +246,8 @@ static void tick_do_broadcast_on_off(void *why) 
		if (!tick_broadcast_force &&

		    cpu_isset(cpu, tick_broadcast_mask)) {

			cpu_clear(cpu, tick_broadcast_mask);

			if (bc->mode == TICKDEV_MODE_PERIODIC)

			if (tick_broadcast_device.mode ==

			    TICKDEV_MODE_PERIODIC)

				tick_setup_periodic(dev, 0);

		}

		break;