summaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-22 17:36:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-22 17:36:56 -0700
commitc54894cd4672d513e43e0d17d7b0387bf6b2c2c4 (patch)
tree85a540716d82570f98a92b85c66ea5875f983f46 /kernel/timer.c
parentfb09bafda67041b74a668dc9d77735e36bd33d3b (diff)
parent4d82a1debbffec129cc387aafa8f40b7bbab3297 (diff)
downloadlinux-c54894cd4672d513e43e0d17d7b0387bf6b2c2c4.tar.gz
linux-c54894cd4672d513e43e0d17d7b0387bf6b2c2c4.tar.bz2
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.c4
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