diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 02:36:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 02:36:56 +0200 |
| commit | c54894cd4672d513e43e0d17d7b0387bf6b2c2c4 (patch) | |
| tree | 85a540716d82570f98a92b85c66ea5875f983f46 /kernel/timer.c | |
| parent | Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | lockdep: fix oops in processing workqueue (diff) | |
| download | linux-c54894cd4672d513e43e0d17d7b0387bf6b2c2c4.tar.xz linux-c54894cd4672d513e43e0d17d7b0387bf6b2c2c4.zip | |
Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue changes from Tejun Heo:
"Nothing exciting. Most are updates to debug stuff and related fixes.
Two not-too-critical bugs are fixed - WARN_ON() triggering spurious
during cpu offlining and unlikely lockdep related oops."
* 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
lockdep: fix oops in processing workqueue
workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is active
workqueue: Catch more locking problems with flush_work()
workqueue: change BUG_ON() to WARN_ON()
trace: Remove unused workqueue tracer
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 837c552fe838..09de9a941cd7 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1108,7 +1108,9 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long), * warnings as well as problems when looking into * timer->lockdep_map, make a copy and use that here. */ - struct lockdep_map lockdep_map = timer->lockdep_map; + struct lockdep_map lockdep_map; + + lockdep_copy_map(&lockdep_map, &timer->lockdep_map); #endif /* * Couple the lock chain with the lock chain at |