Messages in this thread Patch in this message | | | Subject | Re: lockdep: possible reason: unannotated irqs-off. (was: Re: Linux 2.6.38-rc4) | From | Peter Zijlstra <> | Date | Tue, 08 Feb 2011 15:18:00 +0100 |
| |
On Tue, 2011-02-08 at 14:48 +0100, Peter Zijlstra wrote: > > Well that and modifying softirq bits for a lockdep annotation really > feels wrong.
How about we revert it for this release and try again later?
--- Subject: lockdep, timer: Revert the del_timer_sync() annotation
Both attempts at trying to allow softirq usage failed, revert for this release and try again later.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> --- kernel/timer.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/kernel/timer.c b/kernel/timer.c index 343ff27..c848cd8 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -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
| |