| Date | Mon, 29 May 2006 23:26:58 +0200 | From | Ingo Molnar <> | Subject | [patch 48/61] lock validator: special locking: timer.c |
| |
From: Ingo Molnar <mingo@elte.hu>
teach special (recursive) locking code to the lock validator. Has no effect on non-lockdep kernels.
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> --- kernel/timer.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Index: linux/kernel/timer.c =================================================================== --- linux.orig/kernel/timer.c +++ linux/kernel/timer.c @@ -1496,6 +1496,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; @@ -1530,7 +1537,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); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|