From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Dec 2009 17:47:18 +0000 (-0800)
Subject: Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3cd312c3e887b4bee2d94668a481b3d19c07732c;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'timers-fixes-for-linus' of git://git./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:
  timers: Remove duplicate setting of new_base in __mod_timer()
  clockevents: Prevent clockevent_devices list corruption on cpu hotplug
---

3cd312c3e887b4bee2d94668a481b3d19c07732c
diff --cc kernel/time/clockevents.c
index 3d5fc0fd1cca,91db2e33d86a..6f740d9f0948
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@@ -238,10 -238,11 +238,11 @@@ void clockevents_exchange_device(struc
   */
  void clockevents_notify(unsigned long reason, void *arg)
  {
- 	struct list_head *node, *tmp;
+ 	struct clock_event_device *dev, *tmp;
  	unsigned long flags;
+ 	int cpu;
  
 -	spin_lock_irqsave(&clockevents_lock, flags);
 +	raw_spin_lock_irqsave(&clockevents_lock, flags);
  	clockevents_do_notify(reason, arg);
  
  	switch (reason) {