From: Ingo Molnar Teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton --- kernel/timer.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff -puN kernel/timer.c~lock-validator-special-locking-timerc kernel/timer.c --- devel/kernel/timer.c~lock-validator-special-locking-timerc 2006-05-29 18:13:21.000000000 -0700 +++ devel-akpm/kernel/timer.c 2006-05-29 18:13:21.000000000 -0700 @@ -1492,6 +1492,13 @@ asmlinkage long sys_sysinfo(struct sysin return 0; } +/* + * lockdep: we want to track each per-CPU base as a separate lock-type, + * but timer-bases are kmalloc()-ed, so we need to attach separate + * keys to them: + */ +static struct lockdep_type_key base_lock_keys[NR_CPUS]; + static int __devinit init_timers_cpu(int cpu) { int j; @@ -1526,7 +1533,7 @@ static int __devinit init_timers_cpu(int base = per_cpu(tvec_bases, cpu); } - spin_lock_init(&base->lock); + spin_lock_init_key(&base->lock, base_lock_keys + cpu); for (j = 0; j < TVN_SIZE; j++) { INIT_LIST_HEAD(base->tv5.vec + j); INIT_LIST_HEAD(base->tv4.vec + j); _