From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Feb 2013 03:43:20 +0000 (-0800)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.9-rc1~61
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=24e55910e4801d772f95becde20b526b8b10388d;p=~andy%2Flinux

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

Pull timer fixes from Ingo Molnar.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource : Nomadik-mtu : fix missing irq initialization
  posix-timer: Don't call idr_find() with out-of-range ID
---

24e55910e4801d772f95becde20b526b8b10388d
diff --cc drivers/clocksource/nomadik-mtu.c
index 435e54d55bb,7cbcaa02f52..071f6eadfea
--- a/drivers/clocksource/nomadik-mtu.c
+++ b/drivers/clocksource/nomadik-mtu.c
@@@ -240,9 -226,6 +240,10 @@@ void __init nmdk_timer_init(void __iome
  	/* Timer 1 is used for events, register irq and clockevents */
  	setup_irq(irq, &nmdk_timer_irq);
  	nmdk_clkevt.cpumask = cpumask_of(0);
+ 	nmdk_clkevt.irq = irq;
  	clockevents_config_and_register(&nmdk_clkevt, rate, 2, 0xffffffffU);
 +
 +	mtu_delay_timer.read_current_timer = &nmdk_timer_read_current_timer;
 +	mtu_delay_timer.freq = rate;
 +	register_current_timer_delay(&mtu_delay_timer);
  }