locking fix
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
Thanks,
Ingo
------------------>
Peter Zijlstra (1):
Revert "lockdep, timer: Fix del_timer_sync() annotation"
kernel/timer.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
kernel/timer.c +3 -5
@@ -959,7 +959,7 @@ EXPORT_SYMBOL(try_to_del_timer_sync);* * Synchronization rules: Callers must prevent restarting of the timer, * otherwise this function is meaningless. It must not be called from -* hardirq contexts. The caller must not hold locks which would prevent +* interrupt contexts. The caller must not hold locks which would prevent * completion of the timer's handler. The timer's handler must not call * add_timer_on(). Upon exit the timer is not queued and the handler is * not running on any CPU.
@@ -971,12 +971,10 @@ int del_timer_sync(struct timer_list *timer)#ifdef CONFIG_LOCKDEP unsigned long flags; -raw_local_irq_save (flags); -local_bh_disable (); +local_irq_save (flags);lock_map_acquire (&timer->lockdep_map);lock_map_release (&timer->lockdep_map); -_local_bh_enable (); -raw_local_irq_restore (flags); +local_irq_restore (flags);#endif /* * don't use it in hardirq context, because it