Commit a12183c6 authored Mar 25, 2013 by Linus Torvalds

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

Pull timer fix from Thomas Gleixner:
 "A single bugfix which prevents that a non functional timer device is
  selected to provide the fallback device, which is supposed to serve
  timer interrupts on behalf of non functional devices ..."

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clockevents: Don't allow dummy broadcast timers

parents 53b68092 a7dc19b8

kernel/time/tick-broadcast.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,8 @@ static void tick_broadcast_start_periodic(struct clock_event_device *bc)
		*/
		int tick_check_broadcast_device(struct clock_event_device *dev)
		{
		if ((tick_broadcast_device.evtdev &&
		if ((dev->features & CLOCK_EVT_FEAT_DUMMY) \|\|
		(tick_broadcast_device.evtdev &&
		tick_broadcast_device.evtdev->rating >= dev->rating) \|\|
		(dev->features & CLOCK_EVT_FEAT_C3STOP))
		return 0;